Revise filetype detect for json and yesod-htmls
Merge branch 'master' into mac