updated oh-my-zsh
Merge branch 'dev'