Modified vimrc
Merge branch 'master' of https://github.com/pabouttier/dotfiles
Modified vimrc