update my zsh
merge master