Properly parse comments from the end of a line
Merge pull request #1496 from dstufft/strip-extra-whitespace-reqs

Properly parse comments from the end of a line