Integrating Water Supply and Demand into the Global Change Assessment Model (GCAM)