Misc refinements
Merge branch 'master' of github.com:sheedy/dotfiles

Conflicts:
	home/.zshrc