updating master branch

Updating master branch of uct2015 code with the producers and configurations that went into the L1 emulator.
@aglevine Can you check that these are spaces and not tabs?