Make timeout optional

[michaelpj]

I have some tests which are a bit flaky but where I don't particularly care if they take longer. So I'd like to retry them on failure, but not time them out. retry_on: error doesn't do this: it will still fail it if it times out, it just won't retry it. It would be nice to just be able to omit the timeout.