Clean up config, add other distance for EMTrackMatchBuilder

Original motivation for this MR was to make the comments and behavior consistent, but also added another option to use a combined distance for the track matching. This other option is turned off, so the behavior should remain unchanged.

Tagging @christos.