Back to normal.

Note to self: I don't actually have access to write anything to the web
host or the github repo.
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	password-reset.html
	test1.html
	test2.html