Merge branch 'master' into gh-pages
Merge branch 'gh-pages' of https://github.com/marks/ckan-explorer into gh-pages