cleanup for spree 2.2
namespacing, various updates and fixes for spree 2.2