JsonHelper modifications.

Added KeyValuePairConverter to Json serialization settings. Not sure if
this was necessary/helpful.