update vimrc
merged