Update docs to match current master