Started and nearly completed template handling
Merge branch 'master' of https://github.com/Jellyfishboy/mailplate