zsh cleanup

Conflicts:
	zsh/.zsh/10-aliases.zsh