Take new rapidjson
Fix joke indentation effort
Merge pull request #146 from Metaswitch/rapidjson

[DON'T MERGE] [REVIEWER: AMC] Take new rapidjson