add orgainization_type to org listing
Change resource name based on format
Merge branch 'master' of github.com:okfn/ckanext-geodatagov
resolve merge conflict