Updating docs.
merging.
Updating docs and examples, prep for 0.2.0 release.