initial
clean
Merge branch 'master' of https://github.com/Wireheadbe/init.d

Conflicts:
	rtorrent
initial