updated .vimrc
Merge branch 'master' of https://github.com/m1k333/dotfiles