BASH_DEBUG in bashrc
a few alias and function changes
Merge branch 'master' of psaux.de:home

Conflicts:
	.bashrc