Merge pull request #5 from praekelt/feature/template-changes

Various template changes