Refactored section header modules
Fixed merge conflicts
Merge pull request #397 from guardian/header-modules

Refactored section header modules
Fixed issues with trailblock toggle
Merge pull request #398 from guardian/header-modules

Fixed issues with trailblock toggle
:qMerge branch 'master' of github.com:guardian/frontend into scores-component