updated vimrc
Merge branch 'master' of github.com:JasYoung314/global_settings