Got sklearn back into working shape as well

There needs to be some additional work, e.g., correcly implementing a UDA API for BDF, rather than the hacky query construction currently used.