Upgrade RSpec and fix deprecations
Fix failing search feature
Merge pull request #1283 from berkshelf/sethvargo/spec_failures

Fix failing specs and upgrade to RSpec 3