Better handling for the regular tweets that are now appearing in the
eztv twitter feed, and changed the order of the fallbacks to use tpb
first.

It's looking like the only reliable option re eztv is to scrape their
site - wish I could avoid doing that though :(
Merge remote-tracking branch 'upstream/master'