Move JS to where it belongs: *before* closing body tag, not after
Merge branch 'master' into gh-pages

Conflicts:
	index.html