Add timeout for a slave that gets provisioned but then has no work

Resolves effect of #54

Also fix DockerTemplateTest
This was broken before by #46, but also needed to be updated for my changes

This pull request partially supersedes #59 (I broke the two fixes in two).