Pull in docs from master.
Update docs from master.
Update docs to reflect classes in refactored branch.