Merge remote-tracking branch 'origin/abort_work' into hs_staging
Merge remote-tracking branch 'origin/scale_endpoint_and_ui' into hs_staging
Merge branch 'master' into hs_staging
Merge branch 'master' into hs_staging
Merge branch 'master' into hs_staging
ensure mailer can't block

- do mail prep work on thread
- add timeout to calling mesos slave sandboxes
Merge branch 'master' into hs_staging
fix shitty merge
Merge pull request #311 from HubSpot/hs_staging

Hs staging