make PFGeometry a normal class and drop unused variables
remove code I had commented out
updating merge
fix merge conflict
Merge pull request #2885 from davidlange6/remove_statics_v4

Remove statics v4
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X