Yay! No more long description search
Merge branch 'master' of ssh://hax0r.se/home/dunz0r/homedir/configs/

Conflicts:
	.aliasrc
Merge branch 'master' of hax0r.se:homedir/configs