Merge pull request #48 from johnhaley81/conditional-expressions

Conditionals can now evaluate expressions
Loops can now have conditionals as well
Removed legacy test

Since you can now have filters in loops, we have to
prohibit the use of reserved words as a possible name
for a filter
Fixed linter error