Switch to use prezto from oh-my-zsh.
gitconfig local so can pull in new version.
Merge fix