Update .oh-my-zsh
Merge branch 'master' of github.com:jdavis/dotfiles

Conflicts:
	.oh-my-zsh