added socket linger
Merge branch 'master' of https://github.com/mwsmith2/slac-daq
rewrote generate_runlog. its twice as fast now, but id still call it slow...
Merge branch 'mws-dev'
Merge branch 'mws-dev'
Small changes found during sis3350 debugging.
Changed the zmq sockets to pub/sub, and the fe_master now takes an optional argument for a config file.