further work on components.
Merge branch 'master' of https://github.com/NickToye/pixels

Conflicts:
	assets/javascripts/bootstrap/carousel.js
	assets/stylesheets/base/bootstrap/_carousel.scss
	templates/includes/bs/components.liquid
removed gridset.css