Update oh-my-zsh
Merge remote-tracking branch 'origin/master'