updating vimrc
updating for merge