Set the capybara default_wait_time to something big.
Reinstate javascript cucumber tests.
Merge branch 'poltergeist'