Merge pull request #3 from AaronWebster/comment_forward_template

Adds missing template escapes.