fixed remaining template name issues
Merge branch 'master' of github.com:joshfriend/berkup