Refactored Order class and squash merged from orders branch

Conflicts:
	lib/diplo/order.rb
	spec/order_spec.rb