Fixed style issues in data.cpp
Fixed style issues in enrichment_cascade.cpp
Fixed style issues in enrichment.cpp
Fixed style issues in dagmc_bridge.cpp
Fixed style issues in pyne.cpp
Fixed style issues in rxname.cpp
Fixed style issues in enrichment_symbolic15.cpp
Fixed style issues in enrichment_symbolic20.cpp
Fixed style issues in enrichment_symbolic10.cpp
Undid changes to enrichment_symbolic files (autogenerated)
Fixed style in jsoncpp.cpp
Fixed style in material.cpp
Fixed style issues in nucname.cpp
Fixed merge conflicts