Updating, minor fixes from proprietary conversion
Merge branch 'master' of github.com:brianpkelley/video-js-4-plugins