Change jinja to use carrots instead of curly braces
Merge branch 'change-jinja-options'
Fix jinja options setting