Update README for re-merge.