Fixing modernizer part 1.
Fixing modernizr part 2 (removed as submodule)