Improve handling of timed builds
Merge pull request #72 from square/timed_build_improvements

Improve handling of timed builds