refactor so thor plays nice
Merge remote-tracking branch 'origin/dist_task' into dist_task