cleanup
Merge pull request #3775 from civanch/magfield_gen_cleanup

Sim -- Cleanup
Merge remote branch 'origin/CMSSW_7_1_X' into CMSSW_7_0_X