add an accept timeout
Merge branch 'master' of github.com:Phonebooth/ranch