mod vimrc
Merge branch 'master' of github.com:progd/dotfiles