updated .vimrc
merged vimrc