Modified to allow compilation in CMSSW_5_X or CMSSW_6_X
Merge pull request #16 from matthewkenzie/master

Modifications to allow compilation in either CMSSW_5_X or CMSSW_6_X