vim: clean up, mostly hotkeys