Gh 1044

This branch is for gh-1044 and gh-950.  

I think sylvain is still planning to make some tests, and I have a few more sel tests to write, but everything has tested fine, including tests with very large sets of subtitles.