Cleaned up some of the timing debug stuff, and added an arg to disable
data recording.
Close to getting all of the new testing protocol implemented.  Need to
work on fine-tuning the settings.