California Senate Sends Water Deal to Davis