Updates Subliminal with upstream

Simply updates all the things with Inkling's changes.

cc @j-mutter @JakeCataford @qiffp 

Fo' realz this time.