Add more timeouts for potentially long-running commands.
Merge pull request #1 from hilverd/master

Add more timeouts for potentially long-running commands.