remove unused aliases
Merge branch 'master' of https://github.com/Jmayhak/dotfiles

Conflicts:
	.aliases
	.zshrc