Update .vimrc
Merge branch 'master' of github.com:ustasb/dotfiles