README: cleanup botched merge text
Merge pull request #1 from nathantypanski/readme-cleanup

README: cleanup botched merge text