[#1350] resource format change
[#1350] change format of input file and fix some typos
[#1350] merge conflicts
[#1350]  Fix typos and add geojson type
Merge branch 'master' into 1350-resource-format-change
[#1350] Added uniqueness constraint to mimetypes to avoid ambiguity.
Merge pull request #1350 from ckan/1350-resource-format-change

[#1350] Resource format not guessed automatically