Switched back to original settings.

Switched back to stopping based on convergence.
Also switched ipython notebook's options to original values.
Demo file for running code

demo.ipynb should demonstrate currently working portions of the code
Demo notebook with completed run

The demo notebook has a completed run for the sampling on a toy example.
Merge pull request #14 from rzlee/demo

Demo of image generation and source detection