Now the conduit cleans-up after itself (for real)
Revert "uses orchestrator.endSession rather than session.trash, so that files will be removed"

This reverts commit fbf0f5d016109a741861853b2084837b0a00746c.
Merge branch 'stu'