use zilch instead of plain old oh-my-zsh
Merge branch 'master' of github.com:tomru/Dotfiles

Conflicts:
	.gitmodules
	zshrc