[zsh] Use the right vim in git
[vim] Fix annoying wrapped line j/k.