Cleanup 2

Rebase of https://github.com/lisa-lab/pylearn2/pull/613