Bump active merchant and fix broken spec.

Conflicts:
	core/app/models/spree/payment.rb
	core/spec/spec_helper.rb
Fix spec.