Fix for vim keybindings being lost on save, as well as other general remap bugginess