Removes merge conflict markings at README.rdoc and adds ruby version badge link

See bottom part of README.rdoc for merge conflict markings.