We shouldn't display subtitles twice
Merge branch 'staging' of github.com:pculture/unisubs into staging