finished rebasing merge with master.
merging in remote github version that hasn't yet been rebased to master
Merge branch 'master' of github.com:lisa-lab/pylearn2
add softplus layer
fix docstring
fix super argument
Merge pull request #543 from goodfeli/softplus

Add Softplus layer
removed bad whitespace
added restructured text formatting
remove outdated comments
Merge pull request #540 from goodfeli/more_dep

Remove more deprecated functionality, general cleanup
mlp.py almost pep8-clean
mlp.py now pep8-clean
merged in master
Merge pull request #544 from SuperElectric/pep8_fixes

mlp.py now pep8-clean
Added deprecate warning to CrossEntropy and removed it from test_sgd
merge
Merge remote-tracking branch 'upstream/master' into no_crossentropy_class
doc and test for push_monitor
cost.py now pep8-clean. Told .gitignore to ignore meld backup files (.orig) and pylintrc