Advanced, type aware, highlight support for CMake
Merge pull request #2144 from Lindydancer/master

Advanced, type aware, highlight support for CMake