Don't add a charset if none is specified and the content-type is JSON. #197
Fixes #196. If a charset is already specified in the content-type, I opted to leave it there. Else, no charset will be added to the content-type line when the the effective content-type is JSON.
I also reworked the content-type-checking condition make it more legible.