Fix timeout commands where no --timeout specified

Fixes #17
Getting pretty close to civil disobedience against the Rubopolice...
Merge pull request #18 from fancyremarker/fix-timeout

Fix timeout commands where no --timeout specified