Tim support

Builds and starts up conductor cleanly, pointing to a local source
checkout of tim/master.
Merge remote branch 'upstream/master'