update
Merge branch 'master' of github.com:byrongibson/zsh

Conflicts:
	oh-my-zsh