cmake syntax fixes; fix variable name
Merge pull request #1 from autopulated/jinja2-fixes

Jinja2 fixes
Merge branch 'master' into jinja2