just kidding, back to videoJS 3.2
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser