make ajax cart handle multiple cart forms on one page
make ajax cart handle multiple cart forms on one page
fix duplicate ids for multiple product forms on one page
modal padding
update grunt and bower for bootstrap-sass-official 3.2
fix images swticher and zoom when multiple products exist on one page
use correct path for new bootstrap
get correct zoom image; fixes #178
fix option select so it works with multiple products on a page
make link options selectors work for multiple products on a page
clean up some duplicate idss
clean up some duplicate ids
update carousel indicator and control colours
update carousel indicator and control colours
some crazy calculation junk that means the slider caption wont overlap the thing-a-me buttons
fix merge conflicts
Merge branch 'master' into ashhilton

Conflicts:
	Bootstrapify.zip
	theme/assets/carousel.js
	theme/assets/checkout.css.liquid
	theme/assets/modal.js
	theme/assets/scrollspy.js
	theme/assets/transition.js