More bug fixes...

Mainly now, each extra track candidate is matched to its originating vertex candidate via a ExtraTrackCand_vertexId branch in the TTree.