D.C. Council agrees to scrap per-gallon gas tax in favor of levy on wholesale fuel