oh-my-zsh update
Merge branch 'master' of github.com:rfb/dots

Conflicts:
	.oh-my-zsh