Update the aliases
Merge branch 'master' of https://github.com/mackwic/aliases.d

Conflicts:
	common.sh