Create gh-pages branch via GitHub
Merge branch 'master' into gh-pages

Conflicts:
	index.html
cleanup old github template detritus
Merge branch 'gh-pages'