Cleanup + update to Spree 2.2.0.beta