Fix publisher for DGU

data.gov.uk made a schema change to their CKAN install, and now use Organizations to refer to publishers, rather than groups. This reflects this change, but also supports groups. Bonus refactor too!