Don't join until we fix the timeout stuff on select()
Merge pull request #997 from whirm/dont_join

Don't join until we fix the timeout stuff on select()