Update.
Merge branch 'master' of github.com:erichmenge/dotfiles

Conflicts:
	oh-my-zsh/oh-my-zsh