Merge remote-tracking branch 'origin/master'

ckanext/odsh/controller.py

ckanext/odsh/harvest_templates/source/search.html

ckanext/odsh/plugin.py

ckanext/odsh/templates/error_document_template.html

ckanext/odsh/tests/test_validation.py

ckanext/odsh/validation.py

setup.py