[208] Disable publisher dashboard display on this branch (until it is finished).
[368] Dataset API for Drupal side - API has very low limit unless it is a sysadmin, to avoid load issues.
[307] quick template fix.
[307] Template fix for scraper icon (/dataset/dfid-energy-and-water-consumption/resource/50691435-4280-45b3-a1c5-b0aa5612e34a).
[471] Dataset delete button missing - fix logic that got reversed.
[noticket] merged master into stable.
Fix a bad merge on stable.
[477] This is a template error for not_authorized, probably breaks other things too
[491] Fixing broken not_authorized.html template.
[431] Don't bother respecting ckan.tracking_enabled (it isn't) in chartbeat code.
Revert "[431] Don't bother respecting ckan.tracking_enabled (it isn't) in chartbeat code."

This reverts commit 1eec66bc5e0c5dbca653b4ffa12fb89e1ef26fde.
[522] Make sure users are sent with the edited publisher
Merge commit 'a1d1b' into stable

Conflicts:
	ckanext/dgu/theme/templates/not_authorized.html
[524] Fix up ONS tests.

Conflicts:

	ckanext/dgu/tests/ons/test_ons_loader.py
[524] Fixes lots of tests to make them run

Some of our tests were breaking if run as part of an entire testclass
and some were just broken through recent-ish changes.  They should run
now but .. ons and cospread tests aren't running for me because mockdrupal
isn't shutting down.

Conflicts:

	ckanext/dgu/testtools/create_test_data.py
[noticket] useful script for getting stats of themes
[532] Script for listing NHS email addresses.
[488] Make Publisher URIs - improve export of publisher info to get going with reconciliation.
[332] A newer/nicer powered by CKAN logo is available.
[481] Cookie parsing bug - found another place it is parsed.