Merge pull request #6 from vallot/CMSSW_5_3_X

Cmssw 5 3 x
Merge pull request #7 from vallot/CMSSW_5_3_X

Cmssw 5 3 x
turning off photonMatch for data
Merge pull request #4 from jshlee/CMSSW_5_3_X

Cmssw 5 3 x