Just to bring your attention to it, since my ruby's fairly awful, this is the only code I touched. The rest of the diff is just comprised of indentation fixes