silly json fix
Fix rpath for new library install location
#ifndef JSON_IS_AMALGAMATION
Merge branch 'rpath' of https://github.com/crbates/pyne into crbates-rpath
Merge branch 'crbates-rpath' into develop
Merge branch 'json-fix' into develop
some message settings
Rethrow import error to fix #479
rm'd pprint
Merge branch 'rethrow' of https://github.com/crbates/pyne into crbates-rethrow
Merge pull request #480 from scopatz/msg

Prints env settings at the end of install
update ensdf data to close #473
Add supported platforms to close #457
update state map and tests
Merge branch 'crbates-ensdfupdate' into develop
Merge branch 'develop' of github.com:pyne/pyne into develop
Merge branch 'staging' of https://github.com/pyne/pyne into develop
add gamma ray and X-ray data to materials
Fix ensdf bugs

propagate error correctly and calculate parent states correctly.
Clean up docs and add tests