update the vimrc
Merge branch 'master' of https://github.com/fishpj/vim

update the .vimrc
update the vim config