Partial merge from 2.1 branch to solve race conditions preserve capybara-webkit 0.14.2 compat.
Update gemspec.
Update gemspec.