Reinstating some template changes that are required for comment delete button to display correctly
Merge pull request #187 from mreinhardt/master

Reinstating some template changes that are required for comment delete