Resolve conflicts
Cleanup test example
factor out the kl function.
Added the old conv rectified linear class.

Added some documentation.

pep8 and docs.

some pep8.

Put back the softmax doc.

Added ConvElemwise lr_scalers.

more pep8.

removed unnecessary import.

fixed the detector.
Added the new conv.

MAde the batch_size in conv2d optional.

fixed the convolutional rectifier layer.

Fixed the convolutional layer tests.

fixes in the tests.
some fixes.

Removed deprecation warning.

Rebased the new mlp changes.
moved caveats into the description of the parameters they apply to.
Fixed the documentation issues.

Unindent the lines.

Doc fixes.

Added the new doc.

pep8 to tests.

added doc to some funcs.

doc changes.

fixed spaces issue.

fixed a few typos.

Pep8 fixes.

fixed typos.

fixed conv2d error.

Fixed the pep8 errors in tests.
Rebased the code.
added the dots to file path.
Fixed the relative path issue in conv tests.
Removed the rebases remaining harms.
Use monitoring_batches=1 to avoid class representation issues
Cleanup
fixed fprop return value.
Cleanup
Added maxout modifications for monitoring.
Line breaking.
replaced missed prints by logging
Merge pull request #732 from capybaralet/test_wiskott

test_wiskott