Kill pure Vi key bindings, use hybrid behavior instead

Kill pure Vi key bindings, use hybrid behavior instead #7494