Fix up and merge https://github.com/videojs/thumbcoil/tree/hackweek
Fix up and merge https://github.com/videojs/thumbcoil/tree/hackweek