Testing fix for sklearn concurrency bug
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer
Improved test ordering logic (not yet tested)