New ZSH config
Merge remote-t:wqracking branch 'upstream/master'

Conflicts:
	.zshrc
	.zshrc-user