[vimrc] revert some mapping changes and add a few
Merge branch 'master' into work