Don't timeout waiting for a service restart.
Merge branch 'master' of http://github.com/Subsentient/epoch