resolving naming issue
Merge branch 'master' of https://github.com/livhaas/language-nunjucks