Revert "Tweaked vim key mappings"

This reverts commit c942878000afcc2964510d06420da3aaaff36119.