Updates from rspec-dev (2014-12-31)

These are some updates, generated from rspec-dev's rake tasks.
@myronmarston I'm not sure why this part of the diff is different from rspec/rspec-dev#102