Clean up the Photon portion of the HiForest configurations.

Factor some of the mess into EGammaAnalyzers_cff.py