Revert "Revert "de-bundle various recent additions""

This reverts commit 527c0421f007b0e80745114389b2d90f09146230.

Conflicts:
	home/.zshrc