upgrades required for Spree 2.2
Merge pull request #1 from mdundas/spree-2.2

upgrades required for Spree 2.2