increase the amount of time we're willing wait for the docker daemon to start.
unflip a conditional order that read confusingly, and improve some comments around it.
Merge remote-tracking branch 'origin/master'
use force checkouts on graph load, because git doesn't actually isolate separate workdirs nearly enough.