updated vimrc
merged .vimrc