Updated vimrc
Merge branch 'master' of github.com:edurand/dot-files