Merge in template changes.
Added comments block again.
Ooops.
Merge branch 'master' into gh-pages