[vimrc] revert some mapping changes and add a few