updates to amalgamtion such that jsoncpp is supported.
cpp/state_map.cpp
fixed decl enrich ordering issue
Merge pull request #455 from scopatz/amaljson

updates to amalgamtion such that jsoncpp is supported.