Merge upstream from 6a5f01d

This includes all these commits:

https://github.com/boxen/our-boxen/compare/7e0fadf42daa83ac924523f25f4674956e9b303d...6a5f01d

Mostly updates Rubies.