Various changes that probably should make it upstream

Except for the HTML5 media element disposal
Merge pull request #2 from coursera/feature/upstream-changes

Various changes that probably should make it upstream