Added option to calibrate against either odometry or GPS/INS.