updates that didn't make it before
Merge pull request #4 from clseitz/CMSSW_7_0_4

updates that didn't make it before