Changed TODO and other keyword colors.
Merge branch 'master' of https://github.com/simone-trubian/vim
I have no idea why git is making a fuss now.
Let's try this time.