Fix Space

I cherry-picked the new commits from https://github.com/lisa-lab/pylearn2/pull/764