Made JOB_* events consistent
Merge branch 'model_refactor' of https://github.com/twitter/ambrose into model_refactor