I have recently developed a method of extracting from plants that eliminates the problems of two phase solvent mixtures by drying the acidic extract out before defatting and again after dampening the material with a concentrated base (I am suggesting magnesium hydroxide for this purpose) and redrying it, then extracting and finally washing with sodium bicarbonate solution followed by two more plain water washes.
I have written two documents describing this one is more technical and perhaps a little less refined, the other is really simple and aimed at n00bs:
http://elfspice.tripod.com/nu_extract.html
http://elfspice.tripod.com/waterless.html
It has been tested once now, and shortly to be tested again, this time using magnesium hydroxide rather than sodium hydroxide, and it seems to be particularly excellent in the defatting stage in particular, the crud gets taken up in the solvent extremely rapidly and it can be seen whether or not more defatting is needed right away.
