Merging oh-my-zsh changes into my repo.