refactor for scikit-learn renaming
Merge pull request #1 from buhman/master

scikit-learn >= 0.12 refactoring