Revert "Trying some new vim mappings"

This reverts commit 1a7c6a88c88024d87820d5f5eb9323fab1097759.
Revert "Don't clobber builtin vim mapping"

This reverts commit 303bee5eeb3a46e64a43680c8bc5b10c1f6a2d7a.