Update for mac.
Merge branch 'master' of github.com:avp/oh-my-zsh

Conflicts:
	custom/avp.zsh