Update of oh-my-zsh
Committing merged changes