Better message on timeout
Support codeship build number. Revert to build_id