Depend on 2-1-stable branches of Spree in Gemfile
Fixed install generator when scss is used

Fixes #33
Use database_cleaner 1.0.1 to get around postgresql_version issues
Bump to latest paypal-sdk-merchant
fruga merge github