More timeout stuff
Merge pull request #1 from neilmiddleton/unicorn_timeout

More timeout stuff