Merge branch 'gh-pages'
Standards and cleanup for presentability.
Merge branch 'master' into gh-pages

Conflicts:
	js/circles.js
	js/search.js