Add ailas for git difftool and fix ZSH directory config typo
Add alias for git difftool. Fix typo
Merge branch 'master' into server