Merge branch 'dbn_dev' of https://github.com/rdevon/pylearn2 into dbn_dev
Merge branch 'dbn_dev' of https://github.com/rdevon/pylearn2 into dbn_dev