Update README.md
Update vimrc.vim
Update vimrc.vim
v2
fix conflict