removed the requires.rb
Remove (comment) unsued gems
Comment Capybara initializer
Resolve CHANGELOG conflict
Resolve CHANGELOG conflict (again)