added git and zsh magic
Merge branch 'master' of https://github.com/dabido/prezto