diff --git a/Gemfile b/Gemfile
index b1a38ebe..eb5f9906 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,8 +50,7 @@ group :test do
   gem "rspec-expectations"
   gem "database_cleaner"
 
-  # aruba 0.5 conflics with newer gems
-  # gem "aruba", :require => false
+  gem "aruba", :require => false
   gem "simplecov"
   gem "timecop"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index f6e9f392..07cddfe8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,12 +30,17 @@ GEM
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    acts_as_list (0.1.9)
+    acts_as_list (0.2.0)
+      activerecord (>= 3.0)
     arel (3.0.2)
+    aruba (0.5.1)
+      childprocess (~> 0.3.6)
+      cucumber (>= 1.1.1)
+      rspec-expectations (>= 2.7.0)
     bcrypt-ruby (3.0.1)
     bluecloth (2.2.0)
     builder (3.0.4)
-    bullet (4.3.0)
+    bullet (4.3.1)
       uniform_notifier
     cache_digests (0.2.0)
       actionpack (>= 3.2)
@@ -54,18 +59,18 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    cucumber (1.2.1)
+    coffee-script-source (1.5.0)
+    cucumber (1.2.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.11.6)
+      multi_json (~> 1.3)
     cucumber-rails (1.3.0)
       capybara (>= 1.1.2)
       cucumber (>= 1.1.8)
       nokogiri (>= 1.5.0)
     database_cleaner (0.9.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.1)
     erubis (2.7.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -83,7 +88,7 @@ GEM
       json (>= 1.7.6)
     hike (1.2.1)
     htmlentities (4.3.1)
-    i18n (0.6.1)
+    i18n (0.6.4)
     journey (1.0.4)
     jquery-rails (2.2.1)
       railties (>= 3.0, < 5.0)
@@ -126,13 +131,13 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
-    rdoc (3.12.1)
+    rdoc (3.12.2)
       json (~> 1.4)
     ref (1.0.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
     rubyzip (0.9.9)
-    safe_yaml (0.8.3)
+    safe_yaml (0.8.4)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
     sass (3.2.6)
@@ -158,11 +163,11 @@ GEM
     swf_fu (2.0.3)
       coffee-script
       rails (>= 3.1)
-    therubyracer (0.11.3)
+    therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
     thor (0.17.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
     timecop (0.5.9.2)
     tolk (1.3.5)
       safe_yaml
@@ -179,7 +184,7 @@ GEM
     will_paginate (3.0.4)
     xpath (1.0.0)
       nokogiri (~> 1.3)
-    yard (0.8.4.1)
+    yard (0.8.5.2)
 
 PLATFORMS
   ruby
@@ -188,6 +193,7 @@ DEPENDENCIES
   RedCloth
   aasm
   acts_as_list
+  aruba
   bcrypt-ruby
   bullet
   cache_digests
diff --git a/features/make_project_from_template.feature b/features/make_project_from_template.feature
index 994ec84c..83292b0b 100644
--- a/features/make_project_from_template.feature
+++ b/features/make_project_from_template.feature
@@ -14,7 +14,7 @@ Feature: Create project from template
     And I have logged in as "testuser" with password "secret"
     And I have a context called "Context A"
   
-  @javascript @announce @wip
+  @javascript @aruba 
   Scenario: Create a project with one task
     Given a template that looks like
       """
@@ -25,7 +25,7 @@ Feature: Create project from template
     Then I should have a project called "My first project"
     And I should have 1 todo in project "My first project"
     
-  @javascript @wip
+  @javascript @aruba 
   Scenario: Create a project with dependent tasks
     Given a template that looks like
       """
diff --git a/features/step_definitions/template_steps.rb b/features/step_definitions/template_steps.rb
index c79d5ac5..68b481a6 100644
--- a/features/step_definitions/template_steps.rb
+++ b/features/step_definitions/template_steps.rb
@@ -11,14 +11,14 @@ When /^I execute the script$/ do
   step "I cd to \"../..\""
   
   context_id = @current_user.contexts.first.id
-  port = Capybara.current_session.driver.rack_server.port
+  port = Capybara.current_session.server.port
   
   # assumes there is a context with id=1
   cli = "ruby doc/tracks_template_cli.rb -c #{context_id} -f tmp/aruba/template.txt"
   
   set_env('GTD_LOGIN','testuser')
   set_env('GTD_PASSWORD', 'secret')
-  set_env('GTD_TODOS_URL', 'http://localhost:#{port}/todos.xml')
+  set_env('GTD_TODOS_URL', "http://localhost:#{port}/todos.xml")
   set_env('GTD_PROJECTS_URL', "http://localhost:#{port}/projects.xml")
   set_env('GTD_CONTEXT_URL_PREFIX', "http://localhost:#{port}/contexts/")
   set_env("GTD_CONTEXT_URL","http://localhost:#{port}/contexts.xml")
diff --git a/features/support/env.rb b/features/support/env.rb
index acdd228d..a4100006 100644
--- a/features/support/env.rb
+++ b/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
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
index 85c80fa5..268f94e3 100644
--- a/features/support/hooks.rb
+++ b/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
\ No newline at end of file