Fixed error in computing number of packets per experiment for experiments that span > 1 packet.
Merge branch 'fixing_units' of https://github.com/martinisgroup/servers into fixing_units
Merged local changes w/ origin. Hope I didn't screw this up.