Fix bug with syntax highlighting of nested generics

Resolves issue #6
Merge branch 'master' into monodevelop-3.1