oodles of mixin improvements
Merge branch 'gh-pages' of https://github.com/quattromani/scaffold into gh-pages

Conflicts:
	_site/patterns/index.html
	_site/styleguide/index.html
	_site/styleguide/typography/index.html
	css/main.css.map
	css/partials/modules.css.map