Update to vimrc
Merge branch 'master' of https://github.com/brian-d/vim-files