cherry-pick merged in will's changes to README