removed word percent
changed a docstring a little
Merge branch 'aaron-dev'
changed comment for fast sis, array[4][1024] instead of array[8][1024]
put data_io in a temporary state to display fast struck 0 channel 0
Fixed merge conflict in data_io.py.
fixed bug associated with starting run when no data was coming in
Merge branch 'master' of https://github.com/mwsmith2/slac-daq
Uncommented the start/stop zmq lines.
Added build dependency to make and changed some mutex guards.