merge minor zshrc changes from master