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