Various changes in conversion to a non JS version of site.
Merge branch 'master' of https://github.com/jh3y/jh3y.github.io

Conflicts:
	index.html
	js/router.js