update vimrc
Merge branch 'master' of http://github.com/jgors/config_set-ups