update oh-my-zsh
Merge branch 'master' of https://github.com/gleuh/dotfiles

Conflicts:
	setup.sh