Merge pull request #258 from deanberris/0.9-devel

Documentation updates.
Merge pull request #262 from deanberris/0.9-devel

Fixes #261
Merge remote-tracking branch 'deanberris/0.9-devel' into 0.9-devel