Merge remote-tracking branch 'upstream/master'

Conflicts:
	bower.json
	gruntfile.coffee
	site/jekyll/_layouts/default.html
	site/jekyll/_layouts/no-sidebar.html
	site/jekyll/_layouts/sticky-footer.html
	site/js/main.js
	site/stylesheets/partials/_50-backgrounds.scss
	site/stylesheets/partials/_50-nav.scss
	site/stylesheets/partials/_50-sidebar.scss
	site/stylesheets/partials/_90-respond.scss