Make all spec work, switch to thoughtbot way of integration testing

Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'rails', '3.2.11'
+gem 'rails', '3.2.13'
 gem 'rack-cors', :require => 'rack/cors'
 
 # Bundle edge Rails instead:
@@ -36,7 +36,7 @@ gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
 gem 'devise', '2.0.4'
 gem 'devise_simply_stored'
 gem 'simple_form'
-gem 'active_decorator'
+gem 'active_decorator', path: '/Users/bterkuile/companytools/development/rails/components/active_decorator'
 gem 'cmtool', github: 'bterkuile/cmtool'
 gem 'kaminari'
 
@@ -65,6 +65,7 @@ group :test do
   gem 'rspec-rails'
   gem 'cucumber-rails'
   gem 'poltergeist'
+  gem 'selenium-webdriver'
   gem 'database_cleaner'
   gem 'rb-fsevent', :require => false #if RUBY_PLATFORM =~ /darwin/i
   gem 'ruby_gntp'