zsh: use the gitprompt again, it is awesome
vim: add the changes I accidentaly did to a non-git version