Upgrade to spree 2.2, fix tests
Merge pull request #2 from bonobos/2-2-upgrade

Upgrade to spree 2.2, fix tests