Modified Spree layout
Merge branch 'spree' of github.com:aarongitlin/moondog into spree