More aliasing
Merge branch 'master' of https://github.com/media-slave/tower

Conflicts:
	aliases.sh