spree and locomotive improvements
Merge pull request #224 from freego/master

Spree and Locomotive improvements