Spree upgrade 2.2

pull latest released spree, version 2.2.9

https://github.com/godaddy/spree/pull/32 should be merged before this, to reduce the delta to only the spree upgrade commits