Handle errors from the api
Merge remote-tracking branch 'origin/master'

Conflicts:
	[resolved] spec/unit/bitstampede/entities/order_spec.rb