[Reviewer: Rob] Decrease total timeout to 500ms (from 1s)

Rob,

Please can you review?

This fixes #145 - almost - as you noted, until we fix #132 this still won't work in all cases.  I've UT-ed and live-tested to confirm that this fix doesn't break anything.

Matt