Improvements Jelmer

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 matches.

I also had to update the character substitution, because it replaced 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/4260567/57bfe5c6-3b43-11e4-923f-942405712740.png)