merge in changes from local .zshrc