update vimrc
Merge branch 'master' of git://github.com/wgallios/Vim-Settings