Merged with simplify branch.

Mainly, as the name implies, simplified the data_dict.
Also, added a few more methods and got the notebook to get as far as I can get the power point.
(attempting and failing to create the CDFs from the benchmarks.)

Squashed the following commits:
	4b8978b83072575e87d4acb56b7f89f6e5ea3960
	5716cc5f849e46c7953a07cee1f641dec9ac6c46
	c276b3b304162583f17cb95ffec96c624050d595
Added more documentation before I forget everything...