Supervisor/supervisor — pull request #256 by zbenjamin (2013-07-15 17:59:42+00:00)
Title: Lower select timeout and misc fixes

Let me know if you'd like me to split this into several pull requests.