Merge branch 'cgfrost-master'
Ruby Upgrade

This change upgrades the version of Ruby used by the project.