Merge branch 'serverrunner-kill' into shared-dependencies
Merge remote-tracking branch 'origin/evolutionary' into shared-dependencies
adding better __str__ for logging
Merge remote-tracking branch 'origin/shared-dependencies' into updated-str
Merge remote-tracking branch 'origin/evolutionary' into updated-str
fixing QueueConsumer's kill to close down sockets properly
adding socket error test
fixed comments
renaming test
spelling
comment
Merge pull request #71 from onefinestay/queueconsumer-kill

Queueconsumer kill
Merge branch 'evolutionary' into parallel-execution-provider-1938

Conflicts:
	nameko/service.py