Take both the start and end delimiter into account when tokenizing a text template. [#219]
Merge pull request #220 from mikeric/template-tokenizer-improvements

Improve the text template tokenizer