A Water-Energy Research Agenda: Building California's Policy for the 21st Century