Merge branch 'develop' of git://github.com/learningequality/ka-lite into develop
Merge branch 'develop' into subtitles_immediate_fix
Merge branch 'subtitles_immediate_fix' of github.com:dylanjbarth/ka-lite into subtitles_immediate_fix
Deleted leftovers of my code after Ben's changes before PR.