Feed consolidation

As a first step toward a major revamp of the site, I have started consolidating feeds.