Updating vimrc
Merge branch 'master' of github.com:pderichs/dotfiles