Merge pull request #223 from freego/master

Adds Spree Commerce
spree and locomotive improvements