Rewrote .zshrc.
Merge branch 'master' of github.com:tarak/dotfiles

Conflicts:
	.zshrc