New init.d script
Merge remote-tracking branch 'origin/master'

Conflicts:
	files/supervisord-initd