Merge branch 'dataset-refactoring' of git://github.com/UnwashedMeme/clsql