Advancing the Nexus of Water and Equity