Use only one bundle for zsh-files
Merge branch 'master' of github.com:jdavis/dotfiles

Conflicts:
	.zshrc