Drop the _
Update Gems, remove rspec-expect_error and move to RSpec 3