diff --git a/.gitignore b/.gitignore
index f4ed9a8..f2f5f0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-Gemfile.lock
-/test_app/db/schema.rb
-/pkg
 *~
+/pkg
+/rdoc
+/test_app/db/schema.rb
+Gemfile.lock
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index 80506ca..c3378b2 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -16,4 +16,4 @@
 * @widget.unique_impression_count now uses request_hash.  This was incorrectly stated in the README, since it was using ip_address.  The README is correct as a result of the method change.
 
 == 0.2.4 (2011-02-17)
-* Fix issue #1 - action_name and controller_name were not being logged for impressionist method inside action
\ No newline at end of file
+* Fix issue #1 - action_name and controller_name were not being logged for impressionist method inside action
diff --git a/Gemfile b/Gemfile
index 8e3eb82..fa75df1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,24 +1,3 @@
-source "http://rubygems.org"
-
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
-end
-
-group :test do
-  gem 'systemu'
-  gem "rspec"
-  gem "rspec-rails"
-  gem "mongrel", "1.2.0.pre2"
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'cucumber-rails'
-  gem 'cucumber'
-  gem 'spork'
-  gem 'launchy'
-  gem 'autotest-notification'
-  gem 'httpclient'
-end
+source 'https://rubygems.org'
 
+gemspec
diff --git a/README.md b/README.md
index 03f6701..198d7d2 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,22 @@ impressionist
 
 A lightweight plugin that logs impressions per action or manually per model
 
-------------------------------------------------------------------------------------------------------------------------------
+--------------------------------------------------------------------------------
 
 What does this thing do?
 ------------------------
-Logs an impression... and I use that term loosely.  It can log page impressions (technically action impressions), but it is not limited to that.
-You can log impressions multiple times per request.  And you can also attach it to a model.  The goal of this project is to provide customizable
-stats that are immediately accessible in your application as opposed to using G Analytics and pulling data using their API.  You can attach custom
-messages to impressions.  No reporting yet.. this thingy just creates the data.
+Logs an impression... and I use that term loosely.  It can log page impressions
+(technically action impressions), but it is not limited to that. You can log
+impressions multiple times per request.  And you can also attach it to a model.
+The goal of this project is to provide customizable stats that are immediately
+accessible in your application as opposed to using Google Analytics and pulling
+data using their API.  You can attach custom messages to impressions.  No
+reporting yet.. this thingy just creates the data.
 
 What about bots?
 ----------------
-They are ignored.  1200 known bots have been added to the ignore list as of Feb 1, 2011.  Impressionist uses this list:
+They are ignored.  1200 known bots have been added to the ignore list as of
+February 1, 2011.  Impressionist uses this list:
 http://www.user-agents.org/allagents.xml
 
 Installation
@@ -68,46 +72,70 @@ Usage
           impressionist :actions=>[:show,:index]
         end
 
-3. Make your models impressionable.  This allows you to attach impressions to an AR model instance.  Impressionist will automatically log the Model name (based on action_name) and the id (based on params[:id]), but in order to get the count of impressions (example: @widget.impression_count), you will need to make your model impressionalble
+3. Make your models impressionable.  This allows you to attach impressions to
+   an AR model instance.  Impressionist will automatically log the Model name
+   (based on action_name) and the id (based on params[:id]), but in order to
+   get the count of impressions (example: @widget.impression_count), you will
+   need to make your model impressionalble
 
         class Widget < ActiveRecord::Base
           is_impressionable
         end
 
-4. Log an impression per model instance in your controller.  Note that it is not necessary to specify "impressionist" (usage #1) in the top of you controller if you are using this method.  If you add "impressionist" to the top of your controller and also use this method in your action, it will result in 2 impressions being logged (but associated with one request_hash)
+4. Log an impression per model instance in your controller.  Note that it is
+   not necessary to specify "impressionist" (usage #1) in the top of you
+   controller if you are using this method.  If you add "impressionist" to the
+   top of your controller and also use this method in your action, it will
+   result in 2 impressions being logged (but associated with one request_hash)
 
         def show
           @widget = Widget.find
           impressionist(@widget,message:"wtf is a widget?") #message is optional
         end
 
-5. Get unique impression count from a model.  This groups impressions by request_hash, so if you logged multiple impressions per request, it will only count them one time.  This unique impression count will not filter out unique users, only unique requests
+5. Get unique impression count from a model.  This groups impressions by
+   request_hash, so if you logged multiple impressions per request, it will
+   only count them one time.  This unique impression count will not filter out
+   unique users, only unique requests
 
         @widget.impressionist_count
         @widget.impressionist_count(:start_date=>"2011-01-01",:end_date=>"2011-01-05")
         @widget.impressionist_count(:start_date=>"2011-01-01")  #specify start date only, end date = now
 
-6. Get the unique impression count from a model filtered by IP address.  This in turn will give you impressions with unique request_hash, since rows with the same request_hash will have the same IP address.
+6. Get the unique impression count from a model filtered by IP address.  This
+   in turn will give you impressions with unique request_hash, since rows with
+   the same request_hash will have the same IP address.
 
         @widget.impressionist_count(:filter=>:ip_address)
 
-7. Get the unique impression count from a model filtered by session hash.  Same as #6 regarding request hash.  This may be more desirable than filtering by IP address depending on your situation, since filtering by IP may ignore visitors that use the same IP.  The downside to this filtering is that a user could clear session data in their browser and skew the results.
+7. Get the unique impression count from a model filtered by session hash.  Same
+   as #6 regarding request hash.  This may be more desirable than filtering by
+   IP address depending on your situation, since filtering by IP may ignore
+   visitors that use the same IP.  The downside to this filtering is that a
+   user could clear session data in their browser and skew the results.
 
         @widget.impressionist_count(:filter=>:session_hash)
 
-8. Get total impression count.  This may return more than 1 impression per http request, depending on how you are logging impressions
+8. Get total impression count.  This may return more than 1 impression per http
+   request, depending on how you are logging impressions
 
         @widget.impressionist_count(:filter=>:all)
 
-Logging impressions for authenticated users happens automatically.  If you have a current_user helper or use @current_user in your before_filter to set your authenticated user, current_user.id will be written to the user_id field in the impressions table.
+Logging impressions for authenticated users happens automatically.  If you have
+a current_user helper or use @current_user in your before_filter to set your
+authenticated user, current_user.id will be written to the user_id field in the
+impressions table.
 
 Adding a counter cache
 ----------------------
-Impressionist makes it easy to add a `counter_cache` column to your model. The most basic configuration looks like:
+Impressionist makes it easy to add a `counter_cache` column to your model. The
+most basic configuration looks like:
 
     is_impressionable :counter_cache => true
 
-This will automatically increment the `impressions_count` column in the included model. Note: You'll need to add that column to your model. If you'd like specific a different column name, you can:
+This will automatically increment the `impressions_count` column in the
+included model. Note: You'll need to add that column to your model. If you'd
+like specific a different column name, you can:
 
     is_impressionable :counter_cache => { :column_name => :my_column }
 
@@ -115,10 +143,11 @@ If you'd like to include only unique impressions in your count:
 
     is_impressionable :counter_cache => { :column_name => :my_column, :unique => true }
 
-
 What if I only want to record unique impressions?
 -------------------------------------------------
-Maybe you only care about unique impressions and would like to avoid unnecessary database records. You can specify conditions for recording impressions in your controller:
+Maybe you only care about unique impressions and would like to avoid
+unnecessary database records. You can specify conditions for recording
+impressions in your controller:
 
     # only record impression if the request has a unique combination of type, id, and session
     impressionist :unique => [:impressionable_type, :impressionable_id, :session_hash]
@@ -133,30 +162,35 @@ Or you can use the `impressionist` method directly:
 
     impressionist(impressionable, "some message", :unique => [:session_hash])
 
-
 Development Roadmap
 -------------------
-* Automatic impression logging in views.  For example, log initial view, and any partials called from initial view
-* Customizable black list for user-agents or IP addresses.  Impressions will be ignored.  Web admin as part of the Engine.
+* Automatic impression logging in views.  For example, log initial view, and
+  any partials called from initial view
+* Customizable black list for user-agents or IP addresses.  Impressions will be
+  ignored.  Web admin as part of the Engine.
 * Reporting engine
 * AB testing integration
 
 Contributing to impressionist
 -----------------------------
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Check out the latest master to make sure the feature hasn't been implemented
+  or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it
+  and/or contributed it
 * Fork the project
 * Start a feature/bugfix branch
 * Commit and push until you are happy with your contribution
-* Make sure to add rpsec tests for it. Patches or features without tests will be ignored.  Also, try to write better tests than I do ;-)
-* If adding engine controller or view functionality, use HAML and Inherited Resources.
-* All testing is done inside a small Rails app (test_app).  You will find specs within this app.
+* Make sure to add rpsec tests for it. Patches or features without tests will
+  be ignored.  Also, try to write better tests than I do ;-)
+* If adding engine controller or view functionality, use HAML and Inherited
+  Resources.
+* All testing is done inside a small Rails app (test_app).  You will find specs
+  within this app.
 
 Contributors
 ------------
-* johnmcaliley
-* coryschires
-* georgmittendorfer
-
+* [johnmcaliley](https://github.com/johnmcaliley)
+* [coryschires](https://github.com/coryschires)
+* [georgmittendorfer](https://github.com/georgmittendorfer)
 
 Copyright (c) 2011 John McAliley. See LICENSE.txt for further details.
diff --git a/Rakefile b/Rakefile
index 8ad1acf..089e780 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,7 @@
-require 'rubygems'
+#!/usr/bin/env rake
+
 require 'bundler'
+Bundler::GemHelper.install_tasks
 
 begin
   Bundler.setup(:default, :development)
@@ -8,39 +10,8 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "impressionist"
-  gem.homepage = "http://github.com/cowboycoded/impressionist"
-  gem.license = "MIT"
-  gem.summary = %Q{Easy way to log impressions}
-  gem.description = %Q{Log impressions from controller actions or from a model}
-  gem.email = "john.mcaliley@gmail.com"
-  gem.authors = ["cowboycoded"]
-  gem.files.exclude "test_app/**/*", "test_app/**/.*"
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
@@ -50,41 +21,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-namespace :version do
-  desc "create a new version, create tag and push to github"
-  task :patch_release do
-    if Jeweler::Commands::ReleaseToGit.new.clean_staging_area?
-      Rake::Task['version:bump:patch'].invoke
-      Rake::Task['gemspec:release'].invoke
-      Rake::Task['git:release'].invoke
-    else
-      puts "Commit your changed files first"
-    end
-  end
-
-  desc "create a new version, create tag and push to github"
-  task :minor_release do
-    if Jeweler::Commands::ReleaseToGit.new.clean_staging_area?
-      Rake::Task['version:bump:minor'].invoke
-      Rake::Task['gemspec:release'].invoke
-      Rake::Task['git:release'].invoke
-    else
-      puts "Commit your changed files first"
-    end
-  end
-
-  desc "create a new version, create tag and push to github"
-  task :major_release do
-    if Jeweler::Commands::ReleaseToGit.new.clean_staging_area?
-      Rake::Task['version:bump:major'].invoke
-      Rake::Task['gemspec:release'].invoke
-      Rake::Task['git:release'].invoke
-    else
-      puts "Commit your changed files first"
-    end
-  end
-end
-
 namespace :impressionist do
   require File.dirname(__FILE__) + "/lib/impressionist/bots"
 
@@ -92,4 +28,4 @@ namespace :impressionist do
   task :bots do
     p Impressionist::Bots.consume
   end
-end
\ No newline at end of file
+end
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 7f20734..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.1
\ No newline at end of file
diff --git a/app/controllers/impressionist_controller.rb b/app/controllers/impressionist_controller.rb
index 15a87df..6f6e774 100644
--- a/app/controllers/impressionist_controller.rb
+++ b/app/controllers/impressionist_controller.rb
@@ -39,22 +39,22 @@ module ImpressionistController
     end
 
     private
-    
+
     def bypass
       Impressionist::Bots::WILD_CARDS.each do |wild_card|
         return true if request.user_agent and request.user_agent.downcase.include? wild_card
       end
       Impressionist::Bots::LIST.include? request.user_agent
     end
-    
+
     def unique_instance?(impressionable, unique_opts)
       return unique_opts.blank? || !impressionable.impressions.where(unique_query(unique_opts)).exists?
     end
-    
+
     def unique?(unique_opts)
       return unique_opts.blank? || !Impression.where(unique_query(unique_opts)).exists?
     end
-    
+
     # creates the query to check for uniqueness
     def unique_query(unique_opts)
       full_statement = direct_create_statement
@@ -64,7 +64,7 @@ module ImpressionistController
         query
       end
     end
-    
+
     # creates a statment hash that contains default values for creating an impression via an AR relation.
     def associative_create_statement(query_params={})
       query_params.reverse_merge!(
@@ -77,7 +77,7 @@ module ImpressionistController
         :referrer => request.referer
         )
     end
-    
+
     # creates a statment hash that contains default values for creating an impression.
     def direct_create_statement(query_params={})
       query_params.reverse_merge!(
@@ -86,7 +86,7 @@ module ImpressionistController
         )
       associative_create_statement(query_params)
     end
-    
+
     def session_hash
       # # careful: request.session_options[:id] encoding in rspec test was ASCII-8BIT
       # # that broke the database query for uniqueness. not sure if this is a testing only issue.
@@ -95,7 +95,7 @@ module ImpressionistController
       # # request.session_options[:id].encode("ISO-8859-1")
       request.session_options[:id]
     end
-    
+
     #use both @current_user and current_user helper
     def user_id
       user_id = @current_user ? @current_user.id : nil rescue nil
@@ -103,4 +103,4 @@ module ImpressionistController
       user_id
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/impression.rb b/app/models/impression.rb
index 8b01ce9..98c3b33 100644
--- a/app/models/impression.rb
+++ b/app/models/impression.rb
@@ -13,4 +13,4 @@ class Impression < ActiveRecord::Base
       resouce.try(:update_counter_cache)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/app/models/impressionist/bots.rb b/app/models/impressionist/bots.rb
index 21f2012..d0343e9 100644
--- a/app/models/impressionist/bots.rb
+++ b/app/models/impressionist/bots.rb
@@ -1,8 +1,8 @@
 module Impressionist
   module Bots
     WILD_CARDS = ["bot","yahoo","slurp","google","msn","crawler"]
-    
-    LIST = ["<a href='http://www.unchaos.com/'> UnChaos </a> From Chaos To Order Hybrid Web Search Engine.(vadim_gonchar@unchaos.com)", 
+
+    LIST = ["<a href='http://www.unchaos.com/'> UnChaos </a> From Chaos To Order Hybrid Web Search Engine.(vadim_gonchar@unchaos.com)",
       "<a href='http://www.unchaos.com/'> UnChaos Bot Hybrid Web Search Engine. </a> (vadim_gonchar@unchaos.com)",
       "<b> UnChaosBot From Chaos To Order UnChaos Hybrid Web Search Engine at www.unchaos.com </b> (info@unchaos.com)",
       "<http://www.sygol.com/> http://www.sygol.com",
@@ -1459,4 +1459,4 @@ module Impressionist
       "zspider/0.9-dev http://feedback.redkolibri.com/",
       "ZyBorg/1.0 (ZyBorg@WISEnut.com; http://www.WISEnut.com)"]
   end
-end
\ No newline at end of file
+end
diff --git a/config/routes.rb b/config/routes.rb
index c9a9983..1daf9a4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,2 +1,2 @@
 Rails.application.routes.draw do
-end
\ No newline at end of file
+end
diff --git a/impressionist.gemspec b/impressionist.gemspec
index 5b2f667..8f8d937 100644
--- a/impressionist.gemspec
+++ b/impressionist.gemspec
@@ -1,70 +1,21 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+# encoding: utf-8
+require File.expand_path('../lib/impressionist/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{impressionist}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.add_dependency 'httpclient', '~> 2.2'
+  s.add_dependency 'nokogiri', '~> 1.5'
+  s.add_development_dependency 'rake', '>= 0.9'
+  s.add_development_dependency 'rdoc', '>= 2.4.2'
   s.authors = ["cowboycoded"]
-  s.date = %q{2011-11-30}
-  s.description = %q{Log impressions from controller actions or from a model}
-  s.email = %q{john.mcaliley@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    "CHANGELOG.rdoc",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "app/controllers/impressionist_controller.rb",
-    "app/models/impression.rb",
-    "app/models/impressionist/bots.rb",
-    "app/models/impressionist/impressionable.rb",
-    "config/routes.rb",
-    "impressionist.gemspec",
-    "lib/generators/impressionist/impressionist_generator.rb",
-    "lib/generators/impressionist/templates/create_impressions_table.rb",
-    "lib/impressionist.rb",
-    "lib/impressionist/bots.rb",
-    "lib/impressionist/engine.rb",
-    "lib/impressionist/railties/tasks.rake",
-    "logo.png",
-    "upgrade_migrations/version_0_3_0.rb",
-    "upgrade_migrations/version_0_4_0.rb"
-  ]
-  s.homepage = %q{http://github.com/cowboycoded/impressionist}
+  s.description = "Log impressions from controller actions or from a model"
+  s.email = "john.mcaliley@gmail.com"
+  s.files = `git ls-files`.split("\n")
+  s.homepage = "https://github.com/charlotte-ruby/impressionist"
   s.licenses = ["MIT"]
+  s.name = "impressionist"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Easy way to log impressions}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
+  s.summary = "Easy way to log impressions"
+  s.test_files = `git ls-files -- test_app/*`.split("\n")
+  s.version = Impressionist::VERSION
 end
-
diff --git a/lib/generators/impressionist/impressionist_generator.rb b/lib/generators/impressionist/impressionist_generator.rb
index 98273f0..156f1a9 100644
--- a/lib/generators/impressionist/impressionist_generator.rb
+++ b/lib/generators/impressionist/impressionist_generator.rb
@@ -1,5 +1,5 @@
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
 class ImpressionistGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
@@ -17,4 +17,4 @@ class ImpressionistGenerator < Rails::Generators::Base
   def create_migration_file
     migration_template 'create_impressions_table.rb', 'db/migrate/create_impressions_table.rb'
   end
-end
\ No newline at end of file
+end
diff --git a/lib/generators/impressionist/templates/create_impressions_table.rb b/lib/generators/impressionist/templates/create_impressions_table.rb
index 8c2fc69..72de511 100644
--- a/lib/generators/impressionist/templates/create_impressions_table.rb
+++ b/lib/generators/impressionist/templates/create_impressions_table.rb
@@ -34,4 +34,4 @@ class CreateImpressionsTable < ActiveRecord::Migration
 
     drop_table :impressions
   end
-end
\ No newline at end of file
+end
diff --git a/lib/impressionist/bots.rb b/lib/impressionist/bots.rb
index 1fbfb5d..10d3fd6 100644
--- a/lib/impressionist/bots.rb
+++ b/lib/impressionist/bots.rb
@@ -15,4 +15,4 @@ module Impressionist
       list
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/impressionist/engine.rb b/lib/impressionist/engine.rb
index 295fcf2..a4ecfb0 100644
--- a/lib/impressionist/engine.rb
+++ b/lib/impressionist/engine.rb
@@ -14,4 +14,4 @@ module Impressionist
       end
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/impressionist/version.rb b/lib/impressionist/version.rb
new file mode 100644
index 0000000..f8001a3
--- /dev/null
+++ b/lib/impressionist/version.rb
@@ -0,0 +1,3 @@
+module Impressionist
+  VERSION = "1.0.1"
+end
diff --git a/test_app/.gitignore b/test_app/.gitignore
index af64fae..351f638 100644
--- a/test_app/.gitignore
+++ b/test_app/.gitignore
@@ -1,4 +1,17 @@
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile ~/.gitignore_global
+
+# Ignore bundler config
+/.bundle
+/Gemfile.lock
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+
+# Ignore all logfiles and tempfiles.
+/coverage
+/log/*.log
+/tmp
diff --git a/test_app/Gemfile b/test_app/Gemfile
index 4267577..2c1ba22 100644
--- a/test_app/Gemfile
+++ b/test_app/Gemfile
@@ -1,21 +1,53 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
-gem 'rails', '3.1'
-gem 'sqlite3-ruby', :require => 'sqlite3'
-gem 'impressionist', :path=>"#{File.dirname(__FILE__)}/../"
-#gem "pg"
+gem 'rails', '3.2.2'
 
-group :development do
-  gem 'systemu'
-  gem "rspec"
-  gem "rspec-rails"
-  gem "mongrel", "1.2.0.pre2"
-  gem 'capybara'
-  gem 'database_cleaner'
-  gem 'cucumber-rails'
-  gem 'cucumber'
-  gem 'spork'
-  gem 'launchy'
-  gem 'autotest-notification'
-  #gem 'ruby-debug19'
+# Bundle edge Rails instead:
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
+
+gem 'impressionist', :path => '../'
+
+gem 'sqlite3'
+
+gem 'json'
+
+# Gems used only for assets and not required
+# in production environments by default.
+group :assets do
+  gem 'sass-rails',   '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+
+  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
+  # gem 'therubyracer'
+
+  gem 'uglifier', '>= 1.0.3'
 end
+
+group :development, :test do
+  gem 'autotest-notification'
+  gem 'rspec-rails'
+  gem 'spork'
+end
+
+group :test do
+  gem 'capybara'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
+gem 'jquery-rails'
+
+# To use ActiveModel has_secure_password
+# gem 'bcrypt-ruby', '~> 3.0.0'
+
+# To use Jbuilder templates for JSON
+# gem 'jbuilder'
+
+# Use unicorn as the app server
+# gem 'unicorn'
+
+# Deploy with Capistrano
+# gem 'capistrano'
+
+# To use debugger
+# gem 'ruby-debug'
diff --git a/test_app/Gemfile.lock b/test_app/Gemfile.lock
deleted file mode 100644
index d03c6a3..0000000
--- a/test_app/Gemfile.lock
+++ /dev/null
@@ -1,171 +0,0 @@
-PATH
-  remote: /home/mio/prog/projects/impressionist
-  specs:
-    impressionist (1.0.1)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
-      mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (2.2.1)
-    autotest-notification (2.3.3)
-      autotest-standalone (~> 4.5)
-    autotest-standalone (4.5.8)
-    bcrypt-ruby (3.0.1)
-    builder (3.0.0)
-    capybara (1.1.2)
-      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.2.2)
-      ffi (~> 1.0.6)
-    cucumber (1.1.3)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.6)
-    cucumber-rails (1.2.0)
-      capybara (>= 1.1.1)
-      cucumber (>= 1.1.1)
-      nokogiri (>= 1.5.0)
-    daemons (1.0.10)
-    database_cleaner (0.7.0)
-    diff-lcs (1.1.3)
-    erubis (2.7.0)
-    ffi (1.0.11)
-    gem_plugin (0.2.3)
-    gherkin (2.6.8)
-      json (>= 1.4.6)
-    hike (1.2.1)
-    i18n (0.6.0)
-    json (1.6.1)
-    json_pure (1.6.1)
-    launchy (2.0.5)
-      addressable (~> 2.2.6)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    mongrel (1.2.0.pre2)
-      daemons (~> 1.0.10)
-      gem_plugin (~> 0.2.3)
-    multi_json (1.0.3)
-    nokogiri (1.5.0)
-    polyglot (0.3.3)
-    rack (1.3.5)
-    rack-cache (1.0.3)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.2)
-      rack
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
-      bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.11)
-      json (~> 1.4)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    rspec-rails (2.7.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.7.0)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.13.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      json_pure
-      rubyzip
-    spork (0.8.5)
-    sprockets (2.0.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.4)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    systemu (2.4.1)
-    term-ansicolor (1.0.7)
-    thor (0.14.6)
-    tilt (1.3.3)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    xpath (0.1.4)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autotest-notification
-  capybara
-  cucumber
-  cucumber-rails
-  database_cleaner
-  impressionist!
-  launchy
-  mongrel (= 1.2.0.pre2)
-  rails (= 3.1)
-  rspec
-  rspec-rails
-  spork
-  sqlite3-ruby
-  systemu
diff --git a/test_app/README.rdoc b/test_app/README.rdoc
new file mode 100644
index 0000000..7c36f23
--- /dev/null
+++ b/test_app/README.rdoc
@@ -0,0 +1,261 @@
+== Welcome to Rails
+
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Control pattern.
+
+This pattern splits the view (also called the presentation) into "dumb"
+templates that are primarily responsible for inserting pre-built data in between
+HTML tags. The model contains the "smart" domain objects (such as Account,
+Product, Person, Post) that holds all the business logic and knows how to
+persist themselves to a database. The controller handles the incoming requests
+(such as Save New Account, Update Product, Show Post) by manipulating the model
+and directing data to the view.
+
+In Rails, the model is handled by what's called an object-relational mapping
+layer entitled Active Record. This layer allows you to present the data from
+database rows as objects and embellish these data objects with business logic
+methods. You can read more about Active Record in
+link:files/vendor/rails/activerecord/README.html.
+
+The controller and view are handled by the Action Pack, which handles both
+layers by its two parts: Action View and Action Controller. These two layers
+are bundled in a single package due to their heavy interdependence. This is
+unlike the relationship between the Active Record and Action Pack that is much
+more separate. Each of these packages can be used independently outside of
+Rails. You can read more about Action Pack in
+link:files/vendor/rails/actionpack/README.html.
+
+
+== Getting Started
+
+1. At the command prompt, create a new Rails application:
+       <tt>rails new myapp</tt> (where <tt>myapp</tt> is the application name)
+
+2. Change directory to <tt>myapp</tt> and start the web server:
+       <tt>cd myapp; rails server</tt> (run with --help for options)
+
+3. Go to http://localhost:3000/ and you'll see:
+       "Welcome aboard: You're riding Ruby on Rails!"
+
+4. Follow the guidelines to start developing your application. You can find
+the following resources handy:
+
+* The Getting Started Guide: http://guides.rubyonrails.org/getting_started.html
+* Ruby on Rails Tutorial Book: http://www.railstutorial.org/
+
+
+== Debugging Rails
+
+Sometimes your application goes wrong. Fortunately there are a lot of tools that
+will help you debug it and get it back on the rails.
+
+First area to check is the application log files. Have "tail -f" commands
+running on the server.log and development.log. Rails will automatically display
+debugging and runtime information to these files. Debugging info will also be
+shown in the browser on requests from 127.0.0.1.
+
+You can also log your own messages directly into the log file from your code
+using the Ruby logger class from inside your controllers. Example:
+
+  class WeblogController < ActionController::Base
+    def destroy
+      @weblog = Weblog.find(params[:id])
+      @weblog.destroy
+      logger.info("#{Time.now} Destroyed Weblog ID ##{@weblog.id}!")
+    end
+  end
+
+The result will be a message in your log file along the lines of:
+
+  Mon Oct 08 14:22:29 +1000 2007 Destroyed Weblog ID #1!
+
+More information on how to use the logger is at http://www.ruby-doc.org/core/
+
+Also, Ruby documentation can be found at http://www.ruby-lang.org/. There are
+several books available online as well:
+
+* Programming Ruby: http://www.ruby-doc.org/docs/ProgrammingRuby/ (Pickaxe)
+* Learn to Program: http://pine.fm/LearnToProgram/ (a beginners guide)
+
+These two books will bring you up to speed on the Ruby language and also on
+programming in general.
+
+
+== Debugger
+
+Debugger support is available through the debugger command when you start your
+Mongrel or WEBrick server with --debugger. This means that you can break out of
+execution at any point in the code, investigate and change the model, and then,
+resume execution! You need to install ruby-debug to run the server in debugging
+mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
+
+  class WeblogController < ActionController::Base
+    def index
+      @posts = Post.all
+      debugger
+    end
+  end
+
+So the controller will accept the action, run the first line, then present you
+with a IRB prompt in the server window. Here you can do things like:
+
+  >> @posts.inspect
+  => "[#<Post:0x14a6be8
+          @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>,
+       #<Post:0x14a6620
+          @attributes={"title"=>"Rails", "body"=>"Only ten..", "id"=>"2"}>]"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
+
+...and even better, you can examine how your runtime objects actually work:
+
+  >> f = @posts.first
+  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
+  >> f.
+  Display all 152 possibilities? (y or n)
+
+Finally, when you're ready to resume execution, you can enter "cont".
+
+
+== Console
+
+The console is a Ruby shell, which allows you to interact with your
+application's domain model. Here you'll have all parts of the application
+configured, just like it is when the application is running. You can inspect
+domain models, change values, and save to the database. Starting the script
+without arguments will launch it in the development environment.
+
+To start the console, run <tt>rails console</tt> from the application
+directory.
+
+Options:
+
+* Passing the <tt>-s, --sandbox</tt> argument will rollback any modifications
+  made to the database.
+* Passing an environment name as an argument will load the corresponding
+  environment. Example: <tt>rails console production</tt>.
+
+To reload your controllers and models after launching the console run
+<tt>reload!</tt>
+
+More information about irb can be found at:
+link:http://www.rubycentral.org/pickaxe/irb.html
+
+
+== dbconsole
+
+You can go to the command line of your database directly through <tt>rails
+dbconsole</tt>. You would be connected to the database with the credentials
+defined in database.yml. Starting the script without arguments will connect you
+to the development database. Passing an argument will connect you to a different
+database, like <tt>rails dbconsole production</tt>. Currently works for MySQL,
+PostgreSQL and SQLite 3.
+
+== Description of Contents
+
+The default directory structure of a generated Ruby on Rails application:
+
+  |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
+  |   |-- controllers
+  |   |-- helpers
+  |   |-- mailers
+  |   |-- models
+  |   `-- views
+  |       `-- layouts
+  |-- config
+  |   |-- environments
+  |   |-- initializers
+  |   `-- locales
+  |-- db
+  |-- doc
+  |-- lib
+  |   `-- tasks
+  |-- log
+  |-- public
+  |-- script
+  |-- test
+  |   |-- fixtures
+  |   |-- functional
+  |   |-- integration
+  |   |-- performance
+  |   `-- unit
+  |-- tmp
+  |   |-- cache
+  |   |-- pids
+  |   |-- sessions
+  |   `-- sockets
+  `-- vendor
+      |-- assets
+          `-- stylesheets
+      `-- plugins
+
+app
+  Holds all the code that's specific to this particular application.
+
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
+app/controllers
+  Holds controllers that should be named like weblogs_controller.rb for
+  automated URL mapping. All controllers should descend from
+  ApplicationController which itself descends from ActionController::Base.
+
+app/models
+  Holds models that should be named like post.rb. Models descend from
+  ActiveRecord::Base by default.
+
+app/views
+  Holds the template files for the view that should be named like
+  weblogs/index.html.erb for the WeblogsController#index action. All views use
+  eRuby syntax by default.
+
+app/views/layouts
+  Holds the template files for layouts to be used with views. This models the
+  common header/footer method of wrapping views. In your views, define a layout
+  using the <tt>layout :default</tt> and create a file named default.html.erb.
+  Inside default.html.erb, call <% yield %> to render the view using this
+  layout.
+
+app/helpers
+  Holds view helpers that should be named like weblogs_helper.rb. These are
+  generated for you automatically when using generators for controllers.
+  Helpers can be used to wrap functionality for your views into methods.
+
+config
+  Configuration files for the Rails environment, the routing map, the database,
+  and other dependencies.
+
+db
+  Contains the database schema in schema.rb. db/migrate contains all the
+  sequence of Migrations for your schema.
+
+doc
+  This directory is where your application documentation will be stored when
+  generated using <tt>rake doc:app</tt>
+
+lib
+  Application specific libraries. Basically, any kind of custom code that
+  doesn't belong under controllers, models, or helpers. This directory is in
+  the load path.
+
+public
+  The directory available for the web server. Also contains the dispatchers and the
+  default HTML files. This should be set as the DOCUMENT_ROOT of your web
+  server.
+
+script
+  Helper scripts for automation and generation.
+
+test
+  Unit and functional tests along with fixtures. When using the rails generate
+  command, template test files will be generated for you and placed in this
+  directory.
+
+vendor
+  External libraries that the application depends on. Also includes the plugins
+  subdirectory. If the app has frozen rails, those gems also go here, under
+  vendor/rails/. This directory is in the load path.
diff --git a/test_app/Rakefile b/test_app/Rakefile
index 685f6bc..9946cea 100644
--- a/test_app/Rakefile
+++ b/test_app/Rakefile
@@ -1,7 +1,7 @@
+#!/usr/bin/env rake
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
-require 'rake'
 
 TestApp::Application.load_tasks
diff --git a/test_app/app/assets/images/rails.png b/test_app/app/assets/images/rails.png
new file mode 100644
index 0000000..d5edc04
Binary files /dev/null and b/test_app/app/assets/images/rails.png differ
diff --git a/test_app/app/assets/javascripts/application.js b/test_app/app/assets/javascripts/application.js
new file mode 100644
index 0000000..9097d83
--- /dev/null
+++ b/test_app/app/assets/javascripts/application.js
@@ -0,0 +1,15 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+//= require_tree .
diff --git a/test_app/app/assets/stylesheets/application.css b/test_app/app/assets/stylesheets/application.css
new file mode 100644
index 0000000..3b5cc66
--- /dev/null
+++ b/test_app/app/assets/stylesheets/application.css
@@ -0,0 +1,13 @@
+/*
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
+ * listed below.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
+ *= require_self
+ *= require_tree .
+*/
diff --git a/test_app/app/controllers/application_controller.rb b/test_app/app/controllers/application_controller.rb
index ebefa26..1ce61fa 100644
--- a/test_app/app/controllers/application_controller.rb
+++ b/test_app/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
   before_filter :secondary_before_filter
-  
+
   def secondary_before_filter
     @test_secondary_before_filter = "this is a test"
   end
diff --git a/test_app/app/controllers/articles_controller.rb b/test_app/app/controllers/articles_controller.rb
index d154f1d..367b460 100644
--- a/test_app/app/controllers/articles_controller.rb
+++ b/test_app/app/controllers/articles_controller.rb
@@ -1,18 +1,18 @@
 class ArticlesController < ApplicationController
   before_filter :test_current_user_var
-  
+
   def test_current_user_var
     if session[:user_id]
       @current_user = User.new
       @current_user.id = session[:user_id]
     end
   end
-  
+
   def index
     impressionist(Article.first,"this is a test article impression")
   end
-  
+
   def show
     impressionist(Article.first)
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/app/controllers/posts_controller.rb b/test_app/app/controllers/posts_controller.rb
index 9acf731..3526270 100644
--- a/test_app/app/controllers/posts_controller.rb
+++ b/test_app/app/controllers/posts_controller.rb
@@ -2,17 +2,17 @@ class PostsController < ApplicationController
   helper_method :current_user
   impressionist
   def index
-    
+
   end
-  
+
   def show
-    
+
   end
-  
+
   def edit
-    
+
   end
-  
+
   def current_user
     if session[:user_id]
       user = User.new
@@ -20,4 +20,4 @@ class PostsController < ApplicationController
       @current_user ||= user
     end
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/app/controllers/widgets_controller.rb b/test_app/app/controllers/widgets_controller.rb
index 3a7c5dd..433153c 100644
--- a/test_app/app/controllers/widgets_controller.rb
+++ b/test_app/app/controllers/widgets_controller.rb
@@ -1,13 +1,13 @@
 class WidgetsController < ApplicationController
   impressionist :actions=>[:show,:index], :unique => [:controller_name,:action_name,:impressionable_id]
-  
+
   def show
   end
-  
+
   def index
   end
-  
+
   def new
   end
-  
-end
\ No newline at end of file
+
+end
diff --git a/test_app/app/mailers/.gitkeep b/test_app/app/mailers/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/app/models/.gitkeep b/test_app/app/models/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/app/models/dummy.rb b/test_app/app/models/dummy.rb
index ebce846..745c60a 100644
--- a/test_app/app/models/dummy.rb
+++ b/test_app/app/models/dummy.rb
@@ -4,4 +4,4 @@
 class Dummy < ActiveRecord::Base
   self.abstract_class = true # doesn't need to be backed by an actual table
   is_impressionable
-end
\ No newline at end of file
+end
diff --git a/test_app/app/models/user.rb b/test_app/app/models/user.rb
index 6738fc6..6da0f65 100644
--- a/test_app/app/models/user.rb
+++ b/test_app/app/models/user.rb
@@ -1,3 +1,3 @@
 class User
   attr_accessor :id
-end
\ No newline at end of file
+end
diff --git a/test_app/app/views/articles/index.html.erb b/test_app/app/views/articles/index.html.erb
index 0317923..97e10f8 100644
--- a/test_app/app/views/articles/index.html.erb
+++ b/test_app/app/views/articles/index.html.erb
@@ -1 +1 @@
-<%=@impressionist_hash==nil%>
\ No newline at end of file
+<%=@impressionist_hash==nil%>
diff --git a/test_app/app/views/articles/show.html.erb b/test_app/app/views/articles/show.html.erb
index 1826f15..7dc920f 100644
--- a/test_app/app/views/articles/show.html.erb
+++ b/test_app/app/views/articles/show.html.erb
@@ -1 +1 @@
-<%=link_to "Same Page", article_url(Article.first)%>
\ No newline at end of file
+<%=link_to "Same Page", article_url(Article.first)%>
diff --git a/test_app/app/views/layouts/application.html.erb b/test_app/app/views/layouts/application.html.erb
index 92e4534..d4557d8 100644
--- a/test_app/app/views/layouts/application.html.erb
+++ b/test_app/app/views/layouts/application.html.erb
@@ -2,9 +2,9 @@
 <html>
 <head>
   <title>TestApp</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
+  <%= stylesheet_link_tag    "application", :media => "all" %>
+  <%= javascript_include_tag "application" %>
+  <%= csrf_meta_tags %>
 </head>
 <body>
 
diff --git a/test_app/config/application.rb b/test_app/config/application.rb
index 1f4a1f6..d0d0095 100644
--- a/test_app/config/application.rb
+++ b/test_app/config/application.rb
@@ -2,9 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+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
 
 module TestApp
   class Application < Rails::Application
@@ -30,13 +33,27 @@ module TestApp
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
diff --git a/test_app/config/boot.rb b/test_app/config/boot.rb
index ab6cb37..4489e58 100644
--- a/test_app/config/boot.rb
+++ b/test_app/config/boot.rb
@@ -1,13 +1,6 @@
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
-gemfile = File.expand_path('../../Gemfile', __FILE__)
-begin
-  ENV['BUNDLE_GEMFILE'] = gemfile
-  require 'bundler'
-  Bundler.setup
-rescue Bundler::GemNotFound => e
-  STDERR.puts e.message
-  STDERR.puts "Try running `bundle install`."
-  exit!
-end if File.exist?(gemfile)
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
diff --git a/test_app/config/database.yml b/test_app/config/database.yml
index 077168a..45fed06 100644
--- a/test_app/config/database.yml
+++ b/test_app/config/database.yml
@@ -16,7 +16,7 @@ test: &test
 #  adapter: postgresql
 #  database: impressionist_test
 #  username: johnmcaliley
-# password: 
+# password:
 #  host: localhost
 #  encoding: UTF8
 
@@ -27,4 +27,4 @@ production:
   timeout: 5000
 
 cucumber:
-  <<: *test
\ No newline at end of file
+  <<: *test
diff --git a/test_app/config/environments/development.rb b/test_app/config/environments/development.rb
index cf5fb09..b5306b3 100644
--- a/test_app/config/environments/development.rb
+++ b/test_app/config/environments/development.rb
@@ -2,8 +2,8 @@ TestApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
@@ -11,7 +11,6 @@ TestApp::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,17 @@ TestApp::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end
diff --git a/test_app/config/environments/production.rb b/test_app/config/environments/production.rb
index 56e516b..c33789b 100644
--- a/test_app/config/environments/production.rb
+++ b/test_app/config/environments/production.rb
@@ -1,7 +1,6 @@
 TestApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,31 +8,46 @@ TestApp::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
   # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
@@ -46,4 +60,8 @@ TestApp::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end
diff --git a/test_app/config/environments/test.rb b/test_app/config/environments/test.rb
index d17c1ae..21ec8e4 100644
--- a/test_app/config/environments/test.rb
+++ b/test_app/config/environments/test.rb
@@ -2,12 +2,16 @@ TestApp::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching
@@ -25,10 +29,8 @@ TestApp::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
diff --git a/test_app/config/initializers/inflections.rb b/test_app/config/initializers/inflections.rb
index 9e8b013..5d8d9be 100644
--- a/test_app/config/initializers/inflections.rb
+++ b/test_app/config/initializers/inflections.rb
@@ -8,3 +8,8 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end
diff --git a/test_app/config/initializers/wrap_parameters.rb b/test_app/config/initializers/wrap_parameters.rb
new file mode 100644
index 0000000..da4fb07
--- /dev/null
+++ b/test_app/config/initializers/wrap_parameters.rb
@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end
diff --git a/test_app/config/locales/en.yml b/test_app/config/locales/en.yml
index a747bfa..179c14c 100644
--- a/test_app/config/locales/en.yml
+++ b/test_app/config/locales/en.yml
@@ -1,5 +1,5 @@
 # Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
   hello: "Hello world"
diff --git a/test_app/db/migrate/20111127195013_create_impressions_table.rb b/test_app/db/migrate/20111127195013_create_impressions_table.rb
index 22b6a90..72de511 100644
--- a/test_app/db/migrate/20111127195013_create_impressions_table.rb
+++ b/test_app/db/migrate/20111127195013_create_impressions_table.rb
@@ -8,30 +8,30 @@ class CreateImpressionsTable < ActiveRecord::Migration
       t.string :action_name
       t.string :view_name
       t.string :request_hash
-      t.string :session_hash
       t.string :ip_address
-      t.string :message
-      t.string :referrer
+      t.string :session_hash
+      t.text :message
+      t.text :referrer
       t.timestamps
     end
     add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash], :name => "poly_request_index", :unique => false
     add_index :impressions, [:impressionable_type, :impressionable_id, :ip_address], :name => "poly_ip_index", :unique => false
-    add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false    
+    add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false
     add_index :impressions, [:controller_name,:action_name,:request_hash], :name => "controlleraction_request_index", :unique => false
     add_index :impressions, [:controller_name,:action_name,:ip_address], :name => "controlleraction_ip_index", :unique => false
-    add_index :impressions, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false        
+    add_index :impressions, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false
     add_index :impressions, :user_id
   end
 
   def self.down
     remove_index :impressions, :name => :poly_request_index
     remove_index :impressions, :name => :poly_ip_index
-    remove_index :impressions, :name => :poly_session_index        
+    remove_index :impressions, :name => :poly_session_index
     remove_index :impressions, :name => :controlleraction_request_index
     remove_index :impressions, :name => :controlleraction_ip_index
-    remove_index :impressions, :name => :controlleraction_session_index        
+    remove_index :impressions, :name => :controlleraction_session_index
     remove_index :impressions, :user_id
-    
+
     drop_table :impressions
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/db/seeds.rb b/test_app/db/seeds.rb
index 664d8c7..d34dfa0 100644
--- a/test_app/db/seeds.rb
+++ b/test_app/db/seeds.rb
@@ -4,4 +4,4 @@
 # Examples:
 #
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)
+#   Mayor.create(:name => 'Emanuel', :city => cities.first)
diff --git a/test_app/doc/README_FOR_APP b/test_app/doc/README_FOR_APP
new file mode 100644
index 0000000..fe41f5c
--- /dev/null
+++ b/test_app/doc/README_FOR_APP
@@ -0,0 +1,2 @@
+Use this README file to introduce your application and point to useful places in the API for learning more.
+Run "rake doc:app" to generate API documentation for your models, controllers, helpers, and libraries.
diff --git a/test_app/lib/assets/.gitkeep b/test_app/lib/assets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/lib/tasks/cucumber.rake b/test_app/lib/tasks/cucumber.rake
index 7db1a55..982054e 100644
--- a/test_app/lib/tasks/cucumber.rake
+++ b/test_app/lib/tasks/cucumber.rake
@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
diff --git a/test_app/log/.gitkeep b/test_app/log/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/public/500.html b/test_app/public/500.html
index b80307f..f3648a0 100644
--- a/test_app/public/500.html
+++ b/test_app/public/500.html
@@ -20,7 +20,6 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>
diff --git a/test_app/public/index.html b/test_app/public/index.html
new file mode 100644
index 0000000..a1d5099
--- /dev/null
+++ b/test_app/public/index.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Ruby on Rails: Welcome aboard</title>
+    <style type="text/css" media="screen">
+      body {
+        margin: 0;
+        margin-bottom: 25px;
+        padding: 0;
+        background-color: #f0f0f0;
+        font-family: "Lucida Grande", "Bitstream Vera Sans", "Verdana";
+        font-size: 13px;
+        color: #333;
+      }
+
+      h1 {
+        font-size: 28px;
+        color: #000;
+      }
+
+      a  {color: #03c}
+      a:hover {
+        background-color: #03c;
+        color: white;
+        text-decoration: none;
+      }
+
+
+      #page {
+        background-color: #f0f0f0;
+        width: 750px;
+        margin: 0;
+        margin-left: auto;
+        margin-right: auto;
+      }
+
+      #content {
+        float: left;
+        background-color: white;
+        border: 3px solid #aaa;
+        border-top: none;
+        padding: 25px;
+        width: 500px;
+      }
+
+      #sidebar {
+        float: right;
+        width: 175px;
+      }
+
+      #footer {
+        clear: both;
+      }
+
+      #header, #about, #getting-started {
+        padding-left: 75px;
+        padding-right: 30px;
+      }
+
+
+      #header {
+        background-image: url("assets/rails.png");
+        background-repeat: no-repeat;
+        background-position: top left;
+        height: 64px;
+      }
+      #header h1, #header h2 {margin: 0}
+      #header h2 {
+        color: #888;
+        font-weight: normal;
+        font-size: 16px;
+      }
+
+
+      #about h3 {
+        margin: 0;
+        margin-bottom: 10px;
+        font-size: 14px;
+      }
+
+      #about-content {
+        background-color: #ffd;
+        border: 1px solid #fc0;
+        margin-left: -55px;
+        margin-right: -10px;
+      }
+      #about-content table {
+        margin-top: 10px;
+        margin-bottom: 10px;
+        font-size: 11px;
+        border-collapse: collapse;
+      }
+      #about-content td {
+        padding: 10px;
+        padding-top: 3px;
+        padding-bottom: 3px;
+      }
+      #about-content td.name  {color: #555}
+      #about-content td.value {color: #000}
+
+      #about-content ul {
+        padding: 0;
+        list-style-type: none;
+      }
+
+      #about-content.failure {
+        background-color: #fcc;
+        border: 1px solid #f00;
+      }
+      #about-content.failure p {
+        margin: 0;
+        padding: 10px;
+      }
+
+
+      #getting-started {
+        border-top: 1px solid #ccc;
+        margin-top: 25px;
+        padding-top: 15px;
+      }
+      #getting-started h1 {
+        margin: 0;
+        font-size: 20px;
+      }
+      #getting-started h2 {
+        margin: 0;
+        font-size: 14px;
+        font-weight: normal;
+        color: #333;
+        margin-bottom: 25px;
+      }
+      #getting-started ol {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #getting-started li {
+        font-size: 18px;
+        color: #888;
+        margin-bottom: 25px;
+      }
+      #getting-started li h2 {
+        margin: 0;
+        font-weight: normal;
+        font-size: 18px;
+        color: #333;
+      }
+      #getting-started li p {
+        color: #555;
+        font-size: 13px;
+      }
+
+
+      #sidebar ul {
+        margin-left: 0;
+        padding-left: 0;
+      }
+      #sidebar ul h3 {
+        margin-top: 25px;
+        font-size: 16px;
+        padding-bottom: 10px;
+        border-bottom: 1px solid #ccc;
+      }
+      #sidebar li {
+        list-style-type: none;
+      }
+      #sidebar ul.links li {
+        margin-bottom: 5px;
+      }
+
+      .filename {
+        font-style: italic;
+      }
+    </style>
+    <script type="text/javascript">
+      function about() {
+        info = document.getElementById('about-content');
+        if (window.XMLHttpRequest)
+          { xhr = new XMLHttpRequest(); }
+        else
+          { xhr = new ActiveXObject("Microsoft.XMLHTTP"); }
+        xhr.open("GET","rails/info/properties",false);
+        xhr.send("");
+        info.innerHTML = xhr.responseText;
+        info.style.display = 'block'
+      }
+    </script>
+  </head>
+  <body>
+    <div id="page">
+      <div id="sidebar">
+        <ul id="sidebar-items">
+          <li>
+            <h3>Browse the documentation</h3>
+            <ul class="links">
+              <li><a href="http://guides.rubyonrails.org/">Rails Guides</a></li>
+              <li><a href="http://api.rubyonrails.org/">Rails API</a></li>
+              <li><a href="http://www.ruby-doc.org/core/">Ruby core</a></li>
+              <li><a href="http://www.ruby-doc.org/stdlib/">Ruby standard library</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+
+      <div id="content">
+        <div id="header">
+          <h1>Welcome aboard</h1>
+          <h2>You&rsquo;re riding Ruby on Rails!</h2>
+        </div>
+
+        <div id="about">
+          <h3><a href="rails/info/properties" onclick="about(); return false">About your application&rsquo;s environment</a></h3>
+          <div id="about-content" style="display: none"></div>
+        </div>
+
+        <div id="getting-started">
+          <h1>Getting started</h1>
+          <h2>Here&rsquo;s how to get rolling:</h2>
+
+          <ol>
+            <li>
+              <h2>Use <code>rails generate</code> to create your models and controllers</h2>
+              <p>To see all available options, run it without parameters.</p>
+            </li>
+
+            <li>
+              <h2>Set up a default route and remove <span class="filename">public/index.html</span></h2>
+              <p>Routes are set up in <span class="filename">config/routes.rb</span>.</p>
+            </li>
+
+            <li>
+              <h2>Create your database</h2>
+              <p>Run <code>rake db:create</code> to create your database. If you're not using SQLite (the default), edit <span class="filename">config/database.yml</span> with your username and password.</p>
+            </li>
+          </ol>
+        </div>
+      </div>
+
+      <div id="footer">&nbsp;</div>
+    </div>
+  </body>
+</html>
diff --git a/test_app/public/javascripts/controls.js b/test_app/public/javascripts/controls.js
index 7392fb6..75d1bed 100644
--- a/test_app/public/javascripts/controls.js
+++ b/test_app/public/javascripts/controls.js
@@ -962,4 +962,4 @@ Form.Element.DelayedObserver = Class.create({
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-});
\ No newline at end of file
+});
diff --git a/test_app/public/javascripts/dragdrop.js b/test_app/public/javascripts/dragdrop.js
index 15c6dbc..579715e 100644
--- a/test_app/public/javascripts/dragdrop.js
+++ b/test_app/public/javascripts/dragdrop.js
@@ -971,4 +971,4 @@ Element.findChildren = function(element, only, recursive, tagName) {
 
 Element.offsetSize = function (element, type) {
   return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-};
\ No newline at end of file
+};
diff --git a/test_app/public/javascripts/effects.js b/test_app/public/javascripts/effects.js
index c81e6c7..c977462 100644
--- a/test_app/public/javascripts/effects.js
+++ b/test_app/public/javascripts/effects.js
@@ -1120,4 +1120,4 @@ $w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTex
   function(f) { Effect.Methods[f] = Element[f]; }
 );
 
-Element.addMethods(Effect.Methods);
\ No newline at end of file
+Element.addMethods(Effect.Methods);
diff --git a/test_app/spec/controllers/controller_spec.rb b/test_app/spec/controllers/controller_spec.rb
index 5b35182..d2ef67e 100644
--- a/test_app/spec/controllers/controller_spec.rb
+++ b/test_app/spec/controllers/controller_spec.rb
@@ -95,9 +95,9 @@ describe WidgetsController do
     get "show", :id=> 1
     Impression.all.size.should eq 11
   end
-  
+
   describe "impressionist unique options" do
-    
+
     it "should log unique impressions at the per action level" do
       get "show", :id=> 1
       Impression.all.size.should eq 12
@@ -108,7 +108,7 @@ describe WidgetsController do
       get "index"
       Impression.all.size.should eq 14
     end
-    
+
     it "should log unique impressions only once per id" do
       get "show", :id=> 1
       Impression.all.size.should eq 12
@@ -119,7 +119,7 @@ describe WidgetsController do
       get "index"
       Impression.all.size.should eq 14
     end
-  
+
   end
-  
+
 end
diff --git a/test_app/spec/fixtures/articles.yml b/test_app/spec/fixtures/articles.yml
index 86f1482..0a0867d 100644
--- a/test_app/spec/fixtures/articles.yml
+++ b/test_app/spec/fixtures/articles.yml
@@ -1,3 +1,3 @@
 one:
   id: 1
-  name: Test Article
\ No newline at end of file
+  name: Test Article
diff --git a/test_app/spec/fixtures/impressions.yml b/test_app/spec/fixtures/impressions.yml
index 21bf9e1..7342af5 100644
--- a/test_app/spec/fixtures/impressions.yml
+++ b/test_app/spec/fixtures/impressions.yml
@@ -16,7 +16,7 @@ impression8:
   session_hash: b1
   ip_address: 127.0.0.1
   created_at: 2010-01-01
-  
+
 impression9:
   impressionable_type: Article
   impressionable_id: 1
@@ -24,20 +24,20 @@ impression9:
   session_hash: b2
   ip_address: 127.0.0.1
   created_at: 2011-01-03
-    
+
 impression10:
   impressionable_type: Article
   impressionable_id: 1
   request_hash: a9
   session_hash: b3
   ip_address: 127.0.0.8
-  created_at: 2010-01-01  
-  
+  created_at: 2010-01-01
+
 impression11:
   impressionable_type: Article
   impressionable_id: 1
   request_hash: a10
-  session_hash: b4  
+  session_hash: b4
   ip_address: 127.0.0.1
-  created_at: 2010-01-01  
-  
\ No newline at end of file
+  created_at: 2010-01-01
+
diff --git a/test_app/spec/fixtures/posts.yml b/test_app/spec/fixtures/posts.yml
index 6b70243..b85e679 100644
--- a/test_app/spec/fixtures/posts.yml
+++ b/test_app/spec/fixtures/posts.yml
@@ -1,3 +1,3 @@
 one:
   id: 1
-  name: Test Post
\ No newline at end of file
+  name: Test Post
diff --git a/test_app/spec/fixtures/widgets.yml b/test_app/spec/fixtures/widgets.yml
index e93905c..1196246 100644
--- a/test_app/spec/fixtures/widgets.yml
+++ b/test_app/spec/fixtures/widgets.yml
@@ -1,4 +1,4 @@
 one:
   id: 1
   name: A Widget
-  impressions_count: 0
\ No newline at end of file
+  impressions_count: 0
diff --git a/test_app/spec/intializers/initializers_spec.rb b/test_app/spec/intializers/initializers_spec.rb
index bfd9505..879a82a 100644
--- a/test_app/spec/intializers/initializers_spec.rb
+++ b/test_app/spec/intializers/initializers_spec.rb
@@ -3,16 +3,16 @@ require 'spec_helper'
 describe Impressionist do
   it "should be extended from ActiveRecord::Base" do
     method = RUBY_VERSION.match("1.8") ? "is_impressionable" : :is_impressionable
-    ActiveRecord::Base.methods.include?(method).should be true
+    ActiveRecord::Base.methods.include?(method).should be_true
   end
-  
+
   it "should include methods in ApplicationController" do
     method = RUBY_VERSION.match("1.8") ? "impressionist" : :impressionist
-    ApplicationController.instance_methods.include?(method).should be true
+    ApplicationController.instance_methods.include?(method).should be_true
   end
-  
+
   it "should include the before_filter method in ApplicationController" do
      filters = ApplicationController._process_action_callbacks.select { |c| c.kind == :before }
-     filters.collect{|filter|filter.filter}.include?(:impressionist_app_filter).should be true
+     filters.collect{|filter|filter.filter}.include?(:impressionist_app_filter).should be_true
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/spec/models/counter_caching_spec.rb b/test_app/spec/models/counter_caching_spec.rb
index 9c27a61..88cbd73 100644
--- a/test_app/spec/models/counter_caching_spec.rb
+++ b/test_app/spec/models/counter_caching_spec.rb
@@ -27,4 +27,4 @@ describe Impression do
     end
   end
 
-end
\ No newline at end of file
+end
diff --git a/test_app/spec/models/model_spec.rb b/test_app/spec/models/model_spec.rb
index 1fdb9c2..5460166 100644
--- a/test_app/spec/models/model_spec.rb
+++ b/test_app/spec/models/model_spec.rb
@@ -2,33 +2,33 @@ require 'spec_helper'
 
 describe Impression do
   fixtures :articles,:impressions,:posts
-  
+
   before(:each) do
     @article = Article.find(1)
   end
-  
+
   it "should save a blank impression for an Article that has 10 impressions" do
     @article.impressions.create
     @article.impressions.size.should eq 12
   end
-  
+
   it "should save an impression with a message" do
     @article.impressions.create(:message=>"test message")
     @article.impressions.last.message.should eq "test message"
   end
-  
+
   it "should return the impression count for all with no date range specified" do
     @article.impressionist_count(:filter=>:all).should eq 11
   end
-  
+
   it "should return unique impression count with no date range specified" do
     @article.impressionist_count.should eq 9
   end
-  
+
   it "should return impression count with only start date specified" do
     @article.impressionist_count(:start_date=>"2011-01-01",:filter=>:all).should eq 8
   end
-  
+
   it "should return impression count with whole date range specified" do
     @article.impressionist_count(:start_date=>"2011-01-01",:end_date=>"2011-01-02",:filter=>:all).should eq 7
   end
@@ -36,11 +36,11 @@ describe Impression do
   it "should return unique impression count with only start date specified" do
     @article.impressionist_count(:start_date=>"2011-01-01").should eq 7
   end
-  
+
   it "should return unique impression count with date range specified" do
     @article.impressionist_count(:start_date=>"2011-01-01",:end_date=>"2011-01-02").should eq 7
   end
-  
+
   it "should return unique impression count using ip address (which in turn eliminates duplicate request_hashes)" do
     @article.impressionist_count(:filter=>:ip_address).should eq 8
   end
@@ -48,7 +48,7 @@ describe Impression do
   it "should return unique impression count using session_hash (which in turn eliminates duplicate request_hashes)" do
     @article.impressionist_count(:filter=>:session_hash).should eq 7
   end
-  
+
   # tests :dependent => :destroy
   it "should delete impressions on deletion of impressionable" do
     impressions_count = Impression.all.size
@@ -58,20 +58,20 @@ describe Impression do
     a.destroyed?.should be_true
     i.destroyed?.should be_true
   end
-  
+
   #OLD COUNT METHODS.  DEPRECATE SOON
   it "should return the impression count with no date range specified" do
     @article.impression_count.should eq 11
   end
-  
+
   it "should return unique impression count with no date range specified" do
     @article.unique_impression_count.should eq 9
   end
-  
+
   it "should return impression count with only start date specified" do
     @article.impression_count("2011-01-01").should eq 8
   end
-  
+
   it "should return impression count with whole date range specified" do
     @article.impression_count("2011-01-01","2011-01-02").should eq 7
   end
@@ -79,11 +79,11 @@ describe Impression do
   it "should return unique impression count with only start date specified" do
     @article.unique_impression_count("2011-01-01").should eq 7
   end
-  
+
   it "should return unique impression count with date range specified" do
     @article.unique_impression_count("2011-01-01","2011-01-02").should eq 7
   end
-  
+
   it "should return unique impression count using ip address (which in turn eliminates duplicate request_hashes)" do
     @article.unique_impression_count_ip.should eq 8
   end
@@ -91,4 +91,4 @@ describe Impression do
   it "should return unique impression count using session_hash (which in turn eliminates duplicate request_hashes)" do
     @article.unique_impression_count_session.should eq 7
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/spec/rails_generators/rails_generators_spec.rb b/test_app/spec/rails_generators/rails_generators_spec.rb
index 38ffbff..2b5ea93 100644
--- a/test_app/spec/rails_generators/rails_generators_spec.rb
+++ b/test_app/spec/rails_generators/rails_generators_spec.rb
@@ -6,16 +6,18 @@ require 'systemu'
 describe Impressionist do
   fixtures :articles,:impressions,:posts
   it "should delete existing migration and generate the migration file" do
+    pending
     migrations_dir = "#{Rails.root}/db/migrate"
     impressions_migration = Dir.entries(migrations_dir).grep(/impressions/)[0]
     File.delete("#{migrations_dir}/#{impressions_migration}") unless impressions_migration.blank?
     generator_output = systemu("rails g impressionist")[1]
     migration_name = generator_output.split("migrate/")[1].strip
-    Dir.entries(migrations_dir).include?(migration_name).should be true
+    Dir.entries(migrations_dir).include?(migration_name).should be_true
   end
-  
+
   it "should run the migration created in the previous spec" do
+    pending
     migrate_output = systemu("rake db:migrate RAILS_ENV=test")
-    migrate_output[1].include?("CreateImpressionsTable: migrated").should be true
+    migrate_output[1].include?("CreateImpressionsTable: migrated").should be_true
   end
-end
\ No newline at end of file
+end
diff --git a/test_app/spec/spec_helper.rb b/test_app/spec/spec_helper.rb
index f24601c..ad2a267 100644
--- a/test_app/spec/spec_helper.rb
+++ b/test_app/spec/spec_helper.rb
@@ -1,5 +1,7 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+require 'simplecov'
+SimpleCov.start 'rails'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
@@ -24,10 +26,10 @@ RSpec.configure do |config|
   # examples within a transaction, remove the following line or assign false
   # instead of true.
   config.use_transactional_fixtures = true
-  
+
   # make the rails logger usable in the tests as logger.xxx "..."
   def logger
     Rails.logger
   end
-  
+
 end
diff --git a/test_app/test/fixtures/.gitkeep b/test_app/test/fixtures/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/test/functional/.gitkeep b/test_app/test/functional/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/test/integration/.gitkeep b/test_app/test/integration/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/test/performance/browsing_test.rb b/test_app/test/performance/browsing_test.rb
new file mode 100644
index 0000000..3fea27b
--- /dev/null
+++ b/test_app/test/performance/browsing_test.rb
@@ -0,0 +1,12 @@
+require 'test_helper'
+require 'rails/performance_test_help'
+
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
+  def test_homepage
+    get '/'
+  end
+end
diff --git a/test_app/test/test_helper.rb b/test_app/test/test_helper.rb
new file mode 100644
index 0000000..07bc61b
--- /dev/null
+++ b/test_app/test/test_helper.rb
@@ -0,0 +1,15 @@
+ENV["RAILS_ENV"] = "test"
+require 'simplecov'
+SimpleCov.start 'rails'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
+  #
+  # Note: You'll currently still have to declare fixtures explicitly in integration tests
+  # -- they do not yet inherit this setting
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end
diff --git a/test_app/test/unit/.gitkeep b/test_app/test/unit/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/vendor/assets/javascripts/.gitkeep b/test_app/vendor/assets/javascripts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/test_app/vendor/assets/stylesheets/.gitkeep b/test_app/vendor/assets/stylesheets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/upgrade_migrations/version_0_3_0.rb b/upgrade_migrations/version_0_3_0.rb
index 63c8e51..4668125 100644
--- a/upgrade_migrations/version_0_3_0.rb
+++ b/upgrade_migrations/version_0_3_0.rb
@@ -5,23 +5,23 @@ class CreateImpressionsTable < ActiveRecord::Migration
     remove_index :impressions, :name => :controlleraction_index
     add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash], :name => "poly_request_index", :unique => false
     add_index :impressions, [:impressionable_type, :impressionable_id, :ip_address], :name => "poly_ip_index", :unique => false
-    add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false    
+    add_index :impressions, [:impressionable_type, :impressionable_id, :session_hash], :name => "poly_session_index", :unique => false
     add_index :impressions, [:controller_name,:action_name,:request_hash], :name => "controlleraction_request_index", :unique => false
     add_index :impressions, [:controller_name,:action_name,:ip_address], :name => "controlleraction_ip_index", :unique => false
-    add_index :impressions, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false        
-    
+    add_index :impressions, [:controller_name,:action_name,:session_hash], :name => "controlleraction_session_index", :unique => false
+
   end
 
   def self.down
     remove_column :impressions, :session_hash
     remove_index :impressions, :name => :poly_request_index
     remove_index :impressions, :name => :poly_ip_index
-    remove_index :impressions, :name => :poly_session_index        
+    remove_index :impressions, :name => :poly_session_index
     remove_index :impressions, :name => :controlleraction_request_index
     remove_index :impressions, :name => :controlleraction_ip_index
-    remove_index :impressions, :name => :controlleraction_session_index        
+    remove_index :impressions, :name => :controlleraction_session_index
     remove_index :impressions, :user_id
     add_index :impressions, [:impressionable_type, :impressionable_id, :request_hash, :ip_address], :name => "poly_index", :unique => false
-    add_index :impressions, [:controller_name,:action_name,:request_hash,:ip_address], :name => "controlleraction_index", :unique => false    
+    add_index :impressions, [:controller_name,:action_name,:request_hash,:ip_address], :name => "controlleraction_index", :unique => false
   end
-end
\ No newline at end of file
+end
diff --git a/upgrade_migrations/version_0_4_0.rb b/upgrade_migrations/version_0_4_0.rb
index 32dcab9..ebd7fac 100644
--- a/upgrade_migrations/version_0_4_0.rb
+++ b/upgrade_migrations/version_0_4_0.rb
@@ -1,9 +1,9 @@
 class Version04UpdateImpressionsTable < ActiveRecord::Migration
   def self.up
-    add_column :impressions, :referrer, :string    
+    add_column :impressions, :referrer, :string
   end
 
   def self.down
     remove_column :impressions, :referrer
   end
-end
\ No newline at end of file
+end