Yes, eventually the parts of the O Street Pumping Station around but not including the historic 1905 building (and the other building at 125 O Street) are to have probably residential and retail, as part of The Yards. (Though it's not officially part of the Yards footprint yet, there's still negotiations going on between the city, DC Water, and Forest City.)
