Cleanup, per-host settings.
Merge branch 'master' of ssh://github.com/exhuma/dotfiles

Conflicts:
	.zshrc