changes njk if statements to inline expressions

[glgoose]

Implements the ternary like format as described in: https://mozilla.github.io/nunjucks/templating.html#if-expression

[glgoose]

Will close PR for now, discovered some template render errors that I need to fix first.