Use season and episode from myth if available
Merge branch 'master' into 10-24-season-episode
retain ordering of dict entries
integrate mythtv stored season and episode
remove dead code