More clang tweaking and some new 'highlight with color' approach.
Merge branch 'master' of https://github.com/ahelten/dotvim