Merged in seegno's commit for adding oh-my-zsh