master based on spree/master

This updates the Gemfil/gemspec to use the current git master for Spree.