McAllen and Hidalgo reach water agreement