Reinstating conductor additions

This includes the use of the sent field in messages sent to conductor.
Merge pull request #17 from ed-/redo-conductor

Reinstating conductor additions