Specify branch for spree/spree dependency so that we can use local overrides
prepend routes so that they are only drawn once
Fix issue where skrill_status_update was being defined twice
support charging card token and customer card id

https://github.com/Shopify/active_merchant/issues/770

Fixes #93
Use Braintree's card type detection instead of shoehorning into ActiveMerchant's

Fixes #100

Conflicts:
	app/models/spree/gateway/braintree_gateway.rb