Modified vimrc
Merge branch 'master' of github.com:wimroy/config_files