[bug 867560] Add Atom and JSON feed outputs

This fixes some pep-8 things, too.

r?