Renamed method
Merge pull request #80 from WouterJ/fix_templating_helper

Renamed method of templating helper
Refactored to inject helper

- And added unit test
Removed redundant methods
Fixed escaping
Rebased and tidied up