autostart changes, for x61t
added horologium to bashprompt
taurus
Merge branch 'master' of ssh://faui06f.cs.fau.de/~/ciptmp/dotfiles
squarez
Merge branch 'master' of ssh://faui00a.cs.fau.de/~/ciptmp/dotfiles

Conflicts:
	bashscripts
use coloredstderr if available
Merge branch 'master' of ssh://uni/~/ciptmp/dotfiles