Cherry-picked readme changes from rewrite branch