Various fixes

Committing some fixes I have in my private branch. This is in the hope that one of them will fix the problems people have been having with the maxout CIFAR-10 result. This also updates that script to use the hyperparameters from the ICML paper rather than from the earlier arXiv paper.