Fix merge conflict with scikit-learn/master

Turns out the conflict wasn't anything significant.
Merge pull request #6 from perimosocordiae/patch-1

Fix merge conflict with scikit-learn/master