...
Merge branch 'master' of github.com:vdumoulin/research

Conflicts:
	code/pylearn2/datasets/timit.py
Merge branch 'master' of github.com:vdumoulin/research