Make delimiter functions polymorphic
Use less restrictive try for endif token
Use conditionParser to describe the if tests

Before it was inside arrayParser describe, so this is just putting the tests
inside the proper category.
Add else statement tests
Add parsing of else statement into conditionParser
Add if else tests to renderTemplate suite
Add private function for repeated case statement
Change top level renderTemplate to use encode
Add handling for else statement in mergeMap
Merge branch 'expression/if'

This completes the basic implementation of if/else statement.
Something that would be nice to have next:
  * basic logically comparisons (==, /=, >, <, >=, <=)
  * elseif expressions
  * format the inside of the if statement better (ie. indention)