Neuville edges ahead of Ogier