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
fixed semicolon jshint errors
fixed some of the ported tests
Merge branch 'feature/client-timeouts'
merged
Fixed client stop since registrations changed from array to object
Merge remote-tracking branch 'upstream/master'