Update modernizr to conditionizr. Other small tweaks