Removes merge conflict markings at the bottom of README.rdoc
Adds ruby gem version badge link in README.rdoc