Refactor templating
Merge branch 'master' of https://github.com/qualitech/qualitech.github.io