Split feeds back out into their own file.
Assorted cleanups.
I really need to write some more tests.
Add todo item to simplify config handling.