simplify charge computation
cleanup constructors
cosmetics
Merge pull request #4655 from civanch/particle_charge

Simplify charge computation.
Merge remote branch 'origin/CMSSW_7_2_X' into CMSSW_7_0_X