Added amalgamation script
C++ file now alamation compliant.
extra types goes before h5wrap
doc'd amal
spchk
Merge pull request #324 from scopatz/amalgamate

Amalgamate C++ Source Files
Merge branch 'staging' of github.com:pyne/pyne into staging
some final weight -> mass fixes