[#727] Clean up imports in core
Merge remote-tracking branch 'okfn/master' into 727-import-cleans

Conflicts:
	ckan/controllers/feed.py
Merge pull request #727 from okfn/727-import-cleans

import cleanups for 2.1