Improvements

Not to experienced with Git, so had to withdraw previous pull-request to make a little change. This one should be fine!

The old regex had quite some false positives, and also some false negatives. See the attached image for a comparison between the old and the new regex.

I also had to update the character substitution, because it matched the space after the char as well. This resulted in more false 'missing space before operator' errors.

![comparison_regex](https://cloud.githubusercontent.com/assets/1437763/4260626/ea46ae32-3b45-11e4-983f-283f399747d9.png)

While at it, I included Yoran's addition as well.