Merge pull request #133 from EricRahm/strip_comments

Strip comments from templates