Update Ruby to the latest version for security

(CVE-2013-0256) http://www.ruby-lang.org/en/news/2013/02/06/rdoc-xss-cve-2013-0256/
fix merge conflict