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