Remove usages of matchers unsupported in RSpec 3
Update Guardfile for new guard-rspec
Fix described_class support for new RSpec