change the zshrc
Merge from master, make some choices