diff --git a/Gemfile b/Gemfile
index ca32f7c..cb94d85 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,12 +14,12 @@ gem 'devise', '2.0.4'
 gem 'devise_simply_stored'
 gem 'tinymce-rails'
 gem 'haml-rails'
-gem 'sass-rails'
-gem 'bourbon'
 gem 'paperclip'
-gem 'coffee-script'
 gem 'email_validator'
 group :assets do
+  gem 'sass-rails'
+  gem 'bourbon'
+  gem 'coffee-script'
 end
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or
@@ -28,9 +28,8 @@ end
 
 # To use debugger
 group :test do
-  gem 'rspec-rails'
+  gem 'steak'
   gem 'factory_girl_rails'
-  gem 'capybara'
   gem 'pry'
 end
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bffc75..66c6186 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
-  revision: 0359fa86f4025e0a84953c68c7e6e351e9601cbf
+  revision: 955a484c4046b3343f07fd0d783342d01bf26f66
   specs:
     simply_stored (1.0.0)
       activesupport
@@ -35,185 +35,188 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.6)
-      actionpack (= 3.2.6)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.1)
+      journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.6)
-      activesupport (= 3.2.6)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.6)
-      activemodel (= 3.2.6)
-      activesupport (= 3.2.6)
-    activesupport (3.2.6)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bourbon (2.1.0)
-      sass (>= 3.1)
-    builder (3.0.0)
-    capybara (1.1.2)
+    bourbon (2.1.2)
+      sass (>= 3.2)
+      thor
+    builder (3.0.4)
+    capybara (2.0.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
-    cocaine (0.2.1)
-    coderay (1.0.7)
+      xpath (~> 1.0.0)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cocaine (0.4.2)
+    coderay (1.0.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
-    couchrest (1.1.2)
+    coffee-script-source (1.4.0)
+    couchrest (1.1.3)
       mime-types (~> 1.15)
-      multi_json (~> 1.0.0)
+      multi_json (~> 1.0)
       rest-client (~> 1.6.1)
-    daemons (1.1.8)
+    daemons (1.1.9)
     devise (2.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       railties (~> 3.1)
       warden (~> 1.1.1)
-    devise_simply_stored (0.0.2)
+    devise_simply_stored (0.0.3)
       devise
     diff-lcs (1.1.3)
     email_validator (1.3.0)
       activemodel
     erubis (2.7.0)
-    eventmachine (0.12.10)
+    eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (3.5.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (3.5.0)
-      factory_girl (~> 3.5.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
-    haml (3.1.6)
-    haml-rails (0.3.4)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      haml (~> 3.0)
-      railties (~> 3.0)
+    ffi (1.2.0)
+    haml (3.1.7)
+    haml-rails (0.3.5)
+      actionpack (>= 3.1, < 4.1)
+      activesupport (>= 3.1, < 4.1)
+      haml (~> 3.1)
+      railties (>= 3.1, < 4.1)
     hike (1.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     journey (1.0.4)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+    jquery-rails (2.1.3)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
     json (1.6.7)
-    libwebsocket (0.1.3)
-      addressable
+    libwebsocket (0.1.6.1)
+      websocket
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.7.1)
+    method_source (0.8.1)
     mime-types (1.19)
-    multi_json (1.0.4)
+    multi_json (1.3.7)
     nokogiri (1.5.5)
     orm_adapter (0.0.7)
-    paperclip (3.1.2)
+    paperclip (3.3.1)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (>= 0.0.2)
+      cocaine (~> 0.4.0)
       mime-types
     polyglot (0.3.3)
-    pry (0.9.9.6)
+    pry (0.9.10)
       coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
+      method_source (~> 0.8)
+      slop (~> 3.3.1)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.6)
-      actionmailer (= 3.2.6)
-      actionpack (= 3.2.6)
-      activerecord (= 3.2.6)
-      activeresource (= 3.2.6)
-      activesupport (= 3.2.6)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.6)
-    railties (3.2.6)
-      actionpack (= 3.2.6)
-      activesupport (= 3.2.6)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.2)
     rdoc (3.12)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.10.0)
-      rspec-core (~> 2.10.0)
-      rspec-expectations (~> 2.10.0)
-      rspec-mocks (~> 2.10.0)
-    rspec-core (2.10.1)
-    rspec-expectations (2.10.0)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.10.1)
-    rspec-rails (2.10.1)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.10.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    sass (3.1.19)
+    sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.24.0)
+    selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    slop (2.4.4)
-    sprockets (2.1.3)
+    slop (3.3.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thin (1.3.1)
+    steak (2.0.0)
+      capybara (>= 1.0.0)
+      rspec-rails (>= 2.5.0)
+    thin (1.5.0)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.15.3)
+    thor (0.16.0)
     tilt (1.3.3)
-    tinymce-rails (3.5.2)
+    tinymce-rails (3.5.7.1)
       railties (>= 3.1.1)
-    treetop (1.4.10)
+    treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
     warden (1.1.1)
       rack (>= 1.0)
-    xpath (0.1.4)
+    websocket (1.0.3)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -221,7 +224,6 @@ PLATFORMS
 
 DEPENDENCIES
   bourbon
-  capybara
   cmtool!
   coffee-script
   couch_potato!
@@ -233,8 +235,8 @@ DEPENDENCIES
   jquery-rails
   paperclip
   pry
-  rspec-rails
   sass-rails
   simply_stored!
+  steak
   thin
   tinymce-rails
diff --git a/app/assets/stylesheets/cmtool/sessions/structure.css.sass b/app/assets/stylesheets/cmtool/sessions/structure.css.sass
index 01cb983..5645b9b 100644
--- a/app/assets/stylesheets/cmtool/sessions/structure.css.sass
+++ b/app/assets/stylesheets/cmtool/sessions/structure.css.sass
@@ -1,5 +1,5 @@
-@import jquery-ui
-@import bourbon
+@import 'cmtool/jquery-ui'
+@import 'bourbon'
 .clear
   clear: both
 body, html
diff --git a/spec/dummy/config/application.rb b/spec/dummy/config/application.rb
index def64a9..bf96737 100644
--- a/spec/dummy/config/application.rb
+++ b/spec/dummy/config/application.rb
@@ -5,7 +5,12 @@ require "action_mailer/railtie"
 require "active_resource/railtie"
 require "sprockets/railtie"
 
-Bundler.require
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 require "cmtool"
 
 module Dummy