Clean up sentinel channels
Merge remote-tracking branch 'titanous/cleanup-sentinel'

Conflicts:
	server.go