Multiple updates, primarily templates
Merge branch 'master' of https://github.com/harrymansworth/harrymansworth.github.io