General updates.
Merge branch 'master' of http://github.com/xkitterman/vim