Merge branch 'cluster_local' of https://github.com/axeldavy/pylearn2 into cluster_local