Taking the last of what I want from mathiasbynens

Maybe move this to some sort of bootstrap eventually?