merge working dirs

@d3ming - this is the simple fix for collaborator "Run" button.

Before this is merged, we should coordinate strider downtime. We will need to move some directories around to ensure continuity for existing projects.