Spree 2.1 Related Changes

I saw the previous issues related to Spree 2.1 changes and have made a few amendments.