Fixed a discrepancy between lab text and corresponding code in the
scipy.optimize lab.
Another minor edit to scipy.optimize.
Fixed another typo in scipy.optimize.
Merge pull request #445 from abefrandsen/scipyOptimize

Scipy optimize
Merge branch 'master' into montecarlo