Fixed atomic mass/weight problem.
Merge branch 'mass_weight' of https://github.com/elliottbiondo/pyne into elliottbiondo-mass_weight