Merge branch 'master' of github.com:lisa-lab/pylearn2 into mlp_part_of

Conflicts:
	pylearn2/models/mlp.py