Issue #204: Going back to old phrasing including DKAN reference

#204 Wait for tests to pass and merge