Update vimrc
Merge branch 'master' of github.com:nkhumphreys/ShrunkenJump3rConf