Merge pull request #677 from oldhobbyist/fix-feed_links

Fix feed links
First commit removes the ability to turn off feeds. This fixes it plus more cleanup.