Improvement to HTML comments

Fixed issue where HTML comments were not properly ending, causing all code after the start comment tag to appear commented out.
Adjusted to comment section tokens based on recommendation.
Merge pull request #1383 from rgriffith/velocity_mode_improvement

Improvement to HTML comments