vimrc updated
Merged