Refactor Spree::Shipment:

* ruby19 hash syntax
* More DRY