pyne/pyne — pull request #455 by scopatz (2014-05-17 19:43:13+00:00)
Title: updates to amalgamtion such that jsoncpp is supported.

I also had to tweak how state_map was implemented a bit. This is for cyclus so should be reviewed by one of those folks, namely @gidden, @rwcarlsen, @rakhimov or @opotowsky.