Replaced feedburner feed with atom.xml
Merge branch 'rssfeed'