Finally fix oh-my-zsh vi-mode annoyances