Continuing with scikit-learn

Got rid of the bug that gave wrong results. Will use scikit-learn as
this is a very fast implementation. Results look primising.