Merge branch 'master' of https://github.com/mwsmith2/slac-daq into aaron-dev
removed redundant variable definition
Merge branch 'master' of https://github.com/mwsmith2/slac-daq
getting up to date

Merge branch 'master' into aaron-dev
Added a timeout to the zmq messages.
revision of runlog is now possible
merged in aaron-dev
added in_progress argument to revision
Merge branch 'aaron-dev'
Merge branch 'master' into mws-dev