Woods closes in on McIlroy in world ranking after two-shot win at Doral