Bug fix to handle missing HR/Cadence timepoints

More robust combination code to handle cases where a HR or other extra, non-gps
datapoint was not recorded