added mac specific aliases to a test block
Merge branch 'master' of https://github.com/tonyfischetti/zix

Conflicts:
	.zshrc