Factor HTML templates. Misc.
Merge branch 'master' into gh-pages
Build