nunjucks content types
Merge branch 'nunjucks-content'