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.
I think this needs to be `cpp/state_map.cpp'