Simplify templating - the redundant cls.templates weren't being used
Merge pull request #71 from Rosuav/simplify_templating

Simplify templating - the redundant cls.templates weren't being used