changes to vimrc
Merge branch 'master' of https://github.com/trevorcai/config-files