updated vimrc
updated vimrc
various commits