Merge vimrc
Merge branch 'master' of github.com:tlarrieu/dotfiles
Merge with local changes.