oh-my-zsh update and other stuff
Merge branch 'master' into osx