Combine vim/vi-mode.
Move bindings specific to plugins out of vi-mode.