Identation, whitespace and other cosmetics fixes in templates
Fix the tests about rendered result, they were not properly concatenating strings
Merge pull request #88 from tampakrap/templates

Identation, whitespace and other cosmetics fixes in templates