2nd attempt at making dbm_demo unit test
Consistent variable names
Misses a few variable names
make MLP document monitoring channels with what layer they came from
remove old stuff
Deprecated warning for pylearn2.utils.datasets.blend method.
Completed documentation
deleted autoencoder_example/make_garbage_dataset
Merge remote-tracking branch 'upstream/master' into yaml_tests
added line for PEP8
Merge remote-tracking branch 'upstream/master' into monitoring_time
Test cases and fixed discrepency behaviour np_format_as and _format_as
Merge pull request #586 from goodfeli/master

remove old stuff
Merge pull request #585 from goodfeli/doc_channels

make MLP document monitoring channels with what layer they came from
Merge pull request #412 from kyunghyuncho/master

fixed comments; def. value of pos_mf_steps set to 50 in estimate_likelihood
Merge pull request #565 from herr-biber/refactor-dbm-file-structure

Refactor dbm file structure
fix cifar grbm tutorial
Merge pull request #587 from goodfeli/fix_cifar_grbm_smd

fix cifar grbm tutorial
Clearer description of max_labels parameter to DenseDesignMatrix constructor.
Changed behaviour of 'merge' mode in OneHotFormatter.