quick highlight hacks for vim
Merge branch 'master' into fedora-x86_64-dynamis