unified vimrc file -- old function calls removed