Fix PVDXY and MVA NonTrig electron IDs and rename DZ to PVDZ

Apparently I forgot to do this in my last PR. Also re-removed some branches that were overzealously added back into miniAOD ntuples.