I searched and replaced all molecular_weight and replaced them with molecular_mass
updating comments
updating comments and adding back liscense.txt
fixed more incorrect usages of name molecular weight
Added amalgamation script
C++ file now alamation compliant.
extra types goes before h5wrap
Added nuc listing method to mcnp Xsdir
Xsdir.nucs() now returns a set.
undid changes to material_compendium
Fixed merging issues in nuc_data_make.py
Fixed merging issues in nuc_data_make.py
Fixed var names, typo.
Merge branch 'staging' of github.com:pyne/pyne into staging
doc'd amal
spchk
Merge pull request #324 from scopatz/amalgamate

Amalgamate C++ Source Files
Fixed naming issue in nuc_data_make with incorrect import name
replaced atomic_mass.py with atomic_weight.py and renamed atomic_weight.py to atomic_mass.py
fixed indentation