Elizabeth Warren to Join Energy Committee