Egamma hlt

Egamma and subsequent HLT updates; includes and superseeds PR  1116.