strongly typed discovery of episodes and movies. Avoid multiple enumerations.
sort the items because they will be in random order
fixed series combining
Merge pull request #15 from LukePulverenti/master

Improve episode/movie detection