Added tau-jet OR.

Tau-jet overlap removal is now done by the removeTauJetOverlap method.
Added tau-ele and tau-muon OR