Cleanup documentation and examples

This commit integrates the session & stream API examples so that the
differences between the two can be more easily seen. It also simplifies
a few of the examples, removing unnecessary code.
Pick up documentation updates from master branch