Update vimrc and install script
Merge branch 'master' of https://github.com/shanep/vim