Clean zsh aliases
Merge branch 'master' of github.com:tmn/dotfiles

Conflicts:
	zsh/aliases.zsh