This is a fix to move away from bad crap shoved into the zsh history
Merge branch 'master' of github.com:unphased/oh-my-zsh into mine-master

Conflicts:
	zshrc