updates
Merge branch 'master' of https://github.com/kingbin/vimconfig
hopefully in order