[WIP] move waffle to diff endpoint, don't block on waffle/consumer-info after first run (bug 1079681)

Dumped a bunch of code, haven't run it yet.

TODO: tests