Fix broken feed links. Simplify code.
Merge pull request #677 from oldhobbyist/fix-feed_links

Fix feed links