Revert rapidjson merge
Merge #498 r=@kevinmehall: Revert rapidjson merge

Pulled the release due to regressions; might as well have master working while we figure out what to do.