set correct Content-Type for html and json
Merge pull request #2 from ashmckenzie/master

Set correct Content-Type header for json