Switched back to original settings.

Switched back to stopping based on convergence.
Also switched ipython notebook's options to original values.