more explicit docstring
fixed error message
Merge branch 'master' of github.com:lisa-lab/pylearn2
Merge pull request #206 from goodfeli/master

doc and error messages