made configuration file clearer
changed the name of the auto-calibrate log files to be different than manual-calibrate files, other minor syntax stuff
merged changes