Update README.md

That's enough for tonight. All that's left are the crazy merging edge-cases (tentatively titled MERGE MAYHEM)