Update zsh and vim to latest subproject forks