modify zsh setting
Merge branch 'master' into sanritz