Updated key bindings in vim and zsh, and updated vim plugins