Update spree_variant_options
Fix Paperclip URL
Fix spree_gocardless
Add Spree::Money on currency display
Fix CONFLICT from heroku