Various tweaks
Merge branch 'master' of https://github.com/michaelherold/dotfiles

Conflicts:
	home/.zlogin
	home/.zshrc