update docs to reflect current master