Fixed a merge conflict with RSS feeds line commenting.
TODO====- Fix blog CSSSTAGE2======- kiwipycon/conference (don't add until we release site with call for papers) - models (Resistration) - the nzpug incorporated soc a/cPERPETUAL=========- Unittests