Fix for videojs not supproting media queries
Merge branch 'master' of https://github.com/nicholasjgreen/wip