Finished upgrade to work with Spree 2.0