Increase capybara default wait time to 10s

We worked around this with wait_until, but capybara should solve this more efficiently and hopefully more reliably.
Let's see how this impacts cuke execution time.
Merge remote-tracking branch 'origin/feature/rails3' into feature/rails3
Attempt to fix cuke 'Deleting a localized name'

Remove wait_until