return aruba to Gemfile and fix aruba scenarios

features/support/env.rb

@@ -7,6 +7,7 @@ require 'simplecov'
 SimpleCov.start 'rails'
 
 require 'cucumber/rails'
+require 'aruba/cucumber'
 
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd

features/support/hooks.rb

@@ -2,3 +2,8 @@ AfterStep('@pause') do
   print "Press Return to continue..."
   STDIN.getc
 end
+
+Before('@aruba') do
+	@aruba_timeout_seconds = 5
+	# print "\nsetting timeout for aruba to #{@aruba_timeout_seconds}\n"
+end