Update zshrc and gitconfig
Merge branch 'master' of https://github.com/evanwalsh/dotfiles