FIx up the README and .gitignore after the merge