Fix broken tests, update client to make sure that it unregisters on 'stop's
Fix spacing
Fix spacing
Fix spacing
Merge pull request #3 from RBeaudoin/feature/client-timeouts

Feature/client timeouts