corrections
Merge branch 'master' of https://github.com/carloderamo/pylearn2

Conflicts:
	pylearn2/datasets/mnistaugmented.py