updates and fixes some of nunjucks email and layout templates
Merge pull request #66 from danielmahon/master

updates and fixes some of nunjucks email and layout templates