I think biodiesel is going to be coming from algae. Read an article the other day about an AIDs researcher who stumbled across a method of inciting algae (without genetically altering it or killing it) to produce 300% more oil. And it's easily extracted.