removing intra-module pub/sub
don't call mediator directly
Merge pull request #634 from guardian/pub-sub-tidy

Removing intra-module pub/sub