Ugg - punting on merging

So I just edited the README directly.  Need to review how to resolve merge conflicts and find better tools!