Update with some zsh changes
Merge branch 'master' of github.com:sethmcl/dotfiles

* 'master' of github.com:sethmcl/dotfiles:
  updated zshrc

Conflicts:
	.zshrc