Correct variable name.
Add git-diff alias.
Merge branch 'dev_zshrc'