Revert core/order.go to master to simplify merge conflict resolution
Revert core/order.go to master to simplify merge conflict resolution

gubatron/openbazaar-go,OpenBazaar/openbazaar-go,gubatron/openbazaar-go,OpenBazaar/openbazaar-go,gubatron/openbazaar-go,OpenBazaar/openbazaar-go