lotsa stuff

* emit EventJobWatchClaimExpired events
* react to EventJobWatchClaimExpired events by attempting to re-claim the relevant JobWatch object
* react to EventMachineDeleted events by rescheduling any Jobs that were scheduled to the deleted Machine
* minor code cleanup - mostly renaming