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

Conflicts:
	code/pylearn2/datasets/timit.py
Merge pull request #4 from jpraymond/master

Added proportion argument
...
...
Merge branch 'master' of github.com:vdumoulin/research
Merge pull request #5 from jpraymond/master

Corrected a stupid mistake
Merge branch 'master' of github.com:vdumoulin/research
...
Merge branch 'master' of github.com:vdumoulin/research
Reduce memory footprint by computing example indexes on the fly