Sklearn

Merging in all the improvements I made for sklearn compatibility