fixing some spacing, changes to the promo display. change to the product page
Merge branch 'master' of github.com:SalzmanGroup/spree_bootstrap

Conflicts:
	app/assets/stylesheets/store/custom.css