updates
Merge branch 'master' of github.com:SalzmanGroup/spree_bootstrap