First commit removes the ability to turn off feeds. This fixes it plus more cleanup.
Merge pull request #678 from oldhobbyist/fix-feed_links

Fix feed links part 2