Update modernizr, remove jnj-macro shiv