Convert to new hash syntax

Conflicts:
	core/app/models/spree/order/checkout.rb