Modified CalibrationMetric to read in an instrument calibration file,
specified in config.xml, and cleaned up some other classes.
Updated samples/config.xml.mike
Merged changes made to CalibrationMetric in develop branch.