More work on the feed canonicalizer

Handle a lot more feeds.

[ Still no frontend, bleh ]