clean up
Merge branch 'master' into gh-pages

Conflicts:
	index.html
	stylesheets/css/styleguide.css
	stylesheets/less/styleguide.less
Merge branch 'gh-pages'