Merged master's zshrc.