From pumping water uphill to heating thermal batteries, companies are trying new ways to keep power on tap.