Added and unified colornames from vim/X11
Merge branch 'master' of git://github.com/rawrgrr/highlight