updated muon and electron ID
Merge pull request #2 from clseitz/CMSSW_7_0_4

updated muon and electron ID