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

Merge branch 'master' into aaron-dev
revision of runlog is now possible
merged in aaron-dev