Edit my zsh config.
Merge branch 'master' of github.com:zfogg/zfogg

Conflicts:
	.zshrc