updated vimrc
Merge branch 'master' of github.com:benjaminfjones/vim-config