modify git push.default
modify zsh
Merge branch 'master' into sanritz