Refactor highlights subfeeds
Merge pull request #86 from iplayer/highlights-base

Refactor highlights subfeeds