diff --git a/.gitignore b/.gitignore
index 4009e8cbf..b62fbc8d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
-test/*/log/*.log
-doc
-coverage
+*.rbc
+*.swo
+*.swp
+.bundle
 .svn/
+Gemfile.lock
+coverage
+doc
+gemfiles/
 pkg
-*.swp
-*.swo
 tags
+test/*/log/*.log
 tmp
-.bundle
-*.rbc
diff --git a/.travis.yml b/.travis.yml
index 599312346..f8c2c9118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,22 +7,8 @@ rvm:
   - rbx-18mode
   - jruby
 
-gemfile:
-  - gemfiles/3.0.gemfile
-  - gemfiles/3.1.gemfile
-  - gemfiles/3.2.gemfile
-
 matrix:
   allow_failures:
     - rvm: 1.8.7
     - rvm: rbx-18mode
     - rvm: jruby
-  exclude:
-    - rvm: rbx-18mode
-      gemfile: gemfiles/3.0.gemfile
-    - rvm: rbx-18mode
-      gemfile: gemfiles/3.1.gemfile
-    - rvm: jruby
-      gemfile: gemfiles/3.0.gemfile
-    - rvm: jruby
-      gemfile: gemfiles/3.1.gemfile
diff --git a/gemfiles/3.0.gemfile b/gemfiles/3.0.gemfile
deleted file mode 100644
index 2dfd83563..000000000
--- a/gemfiles/3.0.gemfile
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "shoulda-context", "~> 1.0.0"
-gem "sqlite3", :platform=>:ruby
-gem "activerecord-jdbc-adapter", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "jruby-openssl", :platform=>:jruby
-gem "therubyrhino", :platform=>:jruby
-gem "rails", "~> 3.0.17"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.0.gemfile.lock b/gemfiles/3.0.gemfile.lock
deleted file mode 100644
index cfe2283e9..000000000
--- a/gemfiles/3.0.gemfile.lock
+++ /dev/null
@@ -1,139 +0,0 @@
-PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
-  specs:
-    shoulda-matchers (1.5.5)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.20)
-      actionpack (= 3.0.20)
-      mail (~> 2.2.19)
-    actionpack (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.5)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.20)
-      activesupport (= 3.0.20)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-      arel (~> 2.0.10)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.20)
-      activemodel (= 3.0.20)
-      activesupport (= 3.0.20)
-    activesupport (3.0.20)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (2.0.10)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (2.1.2)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.3)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.6)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.1)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (1.4.0)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
-    i18n (0.5.0)
-    json (1.7.7)
-    mail (2.2.19)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.1)
-    polyglot (0.3.3)
-    rack (1.2.8)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.20)
-      actionmailer (= 3.0.20)
-      actionpack (= 3.0.20)
-      activerecord (= 3.0.20)
-      activeresource (= 3.0.20)
-      activesupport (= 3.0.20)
-      bundler (~> 1.0)
-      railties (= 3.0.20)
-    railties (3.0.20)
-      actionpack (= 3.0.20)
-      activesupport (= 3.0.20)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.4)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    shoulda-context (1.0.2)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.14.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
-  aruba
-  bundler (~> 1.1)
-  cucumber (~> 1.1)
-  jdbc-sqlite3
-  jruby-openssl
-  rails (~> 3.0.17)
-  rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
-  shoulda-context (~> 1.0.0)
-  shoulda-matchers!
-  sqlite3
-  strong_parameters
-  therubyrhino
diff --git a/gemfiles/3.1.gemfile b/gemfiles/3.1.gemfile
deleted file mode 100644
index bb7d8c02f..000000000
--- a/gemfiles/3.1.gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "shoulda-context", "~> 1.0.0"
-gem "sqlite3", :platform=>:ruby
-gem "activerecord-jdbc-adapter", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "jruby-openssl", :platform=>:jruby
-gem "therubyrhino", :platform=>:jruby
-gem "rails", "~> 3.1.8"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.1.gemfile.lock b/gemfiles/3.1.gemfile.lock
deleted file mode 100644
index 3dc9be5ce..000000000
--- a/gemfiles/3.1.gemfile.lock
+++ /dev/null
@@ -1,160 +0,0 @@
-PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
-  specs:
-    shoulda-matchers (1.5.5)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.1.11)
-      actionpack (= 3.1.11)
-      mail (~> 2.3.3)
-    actionpack (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
-      rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.11)
-      activesupport (= 3.1.11)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-      arel (~> 2.2.3)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
-      activemodel (= 3.1.11)
-      activesupport (= 3.1.11)
-    activesupport (3.1.11)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (2.2.3)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.3)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.6)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.1)
-    erubis (2.7.0)
-    ffi (1.4.0)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
-    hike (1.2.1)
-    i18n (0.6.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.1)
-    polyglot (0.3.3)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.1.11)
-      actionmailer (= 3.1.11)
-      actionpack (= 3.1.11)
-      activerecord (= 3.1.11)
-      activeresource (= 3.1.11)
-      activesupport (= 3.1.11)
-      bundler (~> 1.0)
-      railties (= 3.1.11)
-    railties (3.1.11)
-      actionpack (= 3.1.11)
-      activesupport (= 3.1.11)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sass (3.2.7)
-    sass-rails (3.1.6)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3.2)
-    shoulda-context (1.0.2)
-    sprockets (2.0.4)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.14.6)
-    tilt (1.3.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
-  aruba
-  bundler (~> 1.1)
-  cucumber (~> 1.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  rails (~> 3.1.8)
-  rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
-  sass-rails
-  shoulda-context (~> 1.0.0)
-  shoulda-matchers!
-  sqlite3
-  strong_parameters
-  therubyrhino
diff --git a/gemfiles/3.2.gemfile b/gemfiles/3.2.gemfile
deleted file mode 100644
index 4fe3a1c8b..000000000
--- a/gemfiles/3.2.gemfile
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "shoulda-context", "~> 1.0.0"
-gem "sqlite3", :platform=>:ruby
-gem "activerecord-jdbc-adapter", :platform=>:jruby
-gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
-gem "jdbc-sqlite3", :platform=>:jruby
-gem "jruby-openssl", :platform=>:jruby
-gem "therubyrhino", :platform=>:jruby
-gem "rails", "~> 3.2.8"
-gem "jquery-rails"
-gem "sass-rails"
-
-gemspec :path=>"../"
\ No newline at end of file
diff --git a/gemfiles/3.2.gemfile.lock b/gemfiles/3.2.gemfile.lock
deleted file mode 100644
index 8f9e59230..000000000
--- a/gemfiles/3.2.gemfile.lock
+++ /dev/null
@@ -1,158 +0,0 @@
-PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
-  specs:
-    shoulda-matchers (1.5.5)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (3.2.13)
-      actionpack (= 3.2.13)
-      mail (~> 2.5.3)
-    actionpack (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.5)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activerecord (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.13)
-      activemodel (= 3.2.13)
-      activesupport (= 3.2.13)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    appraisal (0.5.1)
-      bundler
-      rake
-    arel (3.0.2)
-    aruba (0.5.1)
-      childprocess (~> 0.3.6)
-      cucumber (>= 1.1.1)
-      rspec-expectations (>= 2.7.0)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    builder (3.0.4)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.3)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.6)
-      multi_json (~> 1.3)
-    diff-lcs (1.2.1)
-    erubis (2.7.0)
-    ffi (1.4.0)
-    gherkin (2.11.6)
-      json (>= 1.7.6)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.2.1)
-      railties (>= 3.0, < 5.0)
-      thor (>= 0.14, < 2.0)
-    json (1.7.7)
-    mail (2.5.3)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    metaclass (0.0.1)
-    mime-types (1.21)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    multi_json (1.7.1)
-    polyglot (0.3.3)
-    rack (1.4.5)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.3)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rails (3.2.13)
-      actionmailer (= 3.2.13)
-      actionpack (= 3.2.13)
-      activerecord (= 3.2.13)
-      activeresource (= 3.2.13)
-      activesupport (= 3.2.13)
-      bundler (~> 1.0)
-      railties (= 3.2.13)
-    railties (3.2.13)
-      actionpack (= 3.2.13)
-      activesupport (= 3.2.13)
-      rack-ssl (~> 1.3.2)
-      rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    rspec-rails (2.13.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    sass (3.2.7)
-    sass-rails (3.2.6)
-      railties (~> 3.2.0)
-      sass (>= 3.1.10)
-      tilt (~> 1.3)
-    shoulda-context (1.0.2)
-    sprockets (2.2.2)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7)
-    strong_parameters (0.2.0)
-      actionpack (~> 3.0)
-      activemodel (~> 3.0)
-      railties (~> 3.0)
-    thor (0.17.0)
-    tilt (1.3.6)
-    treetop (1.4.12)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord-jdbc-adapter
-  activerecord-jdbcsqlite3-adapter
-  appraisal (~> 0.4)
-  aruba
-  bundler (~> 1.1)
-  cucumber (~> 1.1)
-  jdbc-sqlite3
-  jquery-rails
-  jruby-openssl
-  rails (~> 3.2.8)
-  rake (>= 0.9.2)
-  rspec-rails (~> 2.13)
-  sass-rails
-  shoulda-context (~> 1.0.0)
-  shoulda-matchers!
-  sqlite3
-  strong_parameters
-  therubyrhino