Fixes bugs where wrong payment method is referenced, and shipping has been already been applied when checking out from cart.

Conflicts:
	app/controllers/spree/checkout_controller_decorator.rb