Use interruptible usleep instead of sleep
Improve handling of wrong slave ID for clients
Reload and restart on SIGHUP
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/collect.c