changes to vimrc
Merge branch 'master' of github.com:zjrosen1/vim