updated vimrc with most recent changes