Updated mappings and vimrc.