vimrc now using proper names for keys, minor changes