Makeflow / Work Queue Environment Take 2

Replaces #636
Are we removing Hadoop?