Add YARDoc and update gems.
Fix a merge conflict in README.md