Makeflow / Work Queue Environment Take 2

Replaces #636
Good catch, I'll get the escape sin there.