Moving Energy Equity from the Margins to the Mainstream