[xs] Helpful SOLR hint.
Merge branch 'master' of ssh://github.com/okfn/ckan
Fix minor bug that caused create_users to not commit changes.
Improve logging in useful places.
Comment required, else Toby would just delete the method out of hand.
Being explicit with imports.
Merge remote-tracking branch 'origin' into release-v2.0.1-dgu

Conflicts:
	ckan/lib/search/__init__.py
	doc/solr-setup.rst
Merge branch 'release-v2.0.1-dgu' of github.com:datagovuk/ckan into release-v2.0.1-dgu

Conflicts:
	ckan/model/data_cache.py
Backported test config from master. Tests now us a hard-coded db now, so do not need a development.ini.