Merges fix/rspec-cleanup. Updates Gemfile.lock.