README tweaks.
Merge conflict resolution.