Update stuff, boo
Merge branch 'master' of https://github.com/brianc/vim-config