Fixes Issue 2637
more elegant way to make sure that the comment is not in a js string var
fix #2637
cleaned up the regex to remove extra qualifiers
used character sets where possible for clarity
main expression optimized
Merge pull request #2657 from DaveMC08/feature/fixes_2637

Fixes Issue #2637