vimrc  updates
Merge