Fix up previous commit.

THe previous commit was intended to introduce rspec/matchers. It
inadvertently added a bunch of other changes.

This patch adds in the remaining files so as to keep the repo sane.