updated vimrc, more changes