Merge pull request #1 from collective/master

merge changes from master to my fork
Update rss.rst
Merge pull request #225 from cewing/master

Please merge this change describing the update to syndication settings in Plone 4.3