Bumps ruby version
Merge branch 'master' into rainbows