Removes Capybara-webkit
Merges Conflict