Improve reliability of capybara tests. Travis gets a number of sporadic failures.