Allow rendered json simplates to specify per-file content types
Minor fix for one more JSON test
Merge pull request #233 from ArmstrongJ/json-type

Allow rendered json simplates to specify per-file content types