Nonidem2.0

I think we can actually ignore #93, and do the merge here on the 2.0 line.  This thing has gotten lousy with merges.  It might be worth rebasing (or reformulating just the core patch to the scheduler module in a less invasive way).

However, before any of that ... we need to get it working!  As written in the DEVLOG below, I'm currently seeing a bunch of lovelocks / timeouts:

```
      v3b: [Failed]
    ERROR: <<timeout>>
```