Diageo heads to New York City from Norwalk, but pledges smaller site in Fairfield County