update ruby for CVE-2013-6393
Merge remote-tracking branch 'heroku/master'
upgrade ruby for CVE-2014-2525