Updated git diff alias in zshrc
Merge branch 'master' of github.com:paritybit/dotfiles