update vimrc windows
merge