1.2.0 prep
Merge pull request #215 from mhaskel/1.2.0-prep

1.2.0 prep
Add missing doc update.
Merge pull request #216 from mhaskel/missing_doc

Add missing doc update.
Merge pull request #217 from mhaskel/test

Merge 1.2.x into master