update zshrc
Merge branch 'master' into ubuntu