updates to vimrc
Merge branch 'master' of https://github.com/LionelMartin/Setup
Merge branch 'master' of https://github.com/LionelMartin/Setup