Update omz
Merge branch 'master' into work-laptop

Conflicts:
	.oh-my-zsh
New Bin changes