Updated the Gemfile so that you no longer get the Sprockets gem error…

… due to them yanking their older beta gems.

Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1.0.rc4'
+gem 'rails', '~> 3.1.0.rc6'
 gem 'mysql2'
 
 # core function gems
@@ -19,7 +19,7 @@ gem 'carmen'
 gem 'geo_location'
 
 # asset gems
-gem 'slim', :git => 'git://github.com/stonean/slim.git'
+gem 'slim', '~> 1.0.0'
 gem 'slim-rails'
 gem 'sass'
 gem 'coffee-script'

Gemfile.lock

@@ -4,72 +4,62 @@ GIT
   specs:
     nested_form (0.1.1)
 
-GIT
-  remote: git://github.com/stonean/slim.git
-  revision: a3465a03f913fb1c724797c785f13703265acd12
-  specs:
-    slim (0.9.4)
-      temple (~> 0.3.0)
-      tilt (~> 1.2)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
+    actionmailer (3.1.0.rc6)
+      actionpack (= 3.1.0.rc6)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    actionpack (3.1.0.rc6)
+      activemodel (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
-      rack (~> 1.3.0)
-      rack-cache (~> 1.0.1)
+      rack (~> 1.3.2)
+      rack-cache (~> 1.0.2)
       rack-mount (~> 0.8.1)
       rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.10)
-      tzinfo (~> 0.3.27)
-    activemodel (3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+      sprockets (~> 2.0.0.beta.12)
+    activemodel (3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
       bcrypt-ruby (~> 2.1.4)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-      arel (~> 2.1.1)
-      tzinfo (~> 0.3.27)
-    activeresource (3.1.0.rc4)
-      activemodel (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
-    activesupport (3.1.0.rc4)
+    activerecord (3.1.0.rc6)
+      activemodel (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+      arel (~> 2.2.1)
+      tzinfo (~> 0.3.29)
+    activeresource (3.1.0.rc6)
+      activemodel (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
+    activesupport (3.1.0.rc6)
       multi_json (~> 1.0)
     addressable (2.2.4)
     ansi (1.3.0)
-    arel (2.1.3)
+    arel (2.2.1)
     bcrypt-ruby (2.1.4)
     builder (3.0.0)
-    capybara (1.0.0)
+    capybara (1.0.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 0.2.0)
+      selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
     carmen (0.2.8)
-    carrierwave (0.5.5)
+    carrierwave (0.5.7)
       activesupport (~> 3.0)
-    childprocess (0.1.9)
+    childprocess (0.2.1)
       ffi (~> 1.0.6)
-    chronic (0.5.0)
+    chronic (0.6.2)
     client_side_validations (3.1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.1.1)
-    configuration (1.3.1)
-    cucumber (1.0.1)
+    coffee-script-source (1.1.2)
+    cucumber (1.0.2)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
       gherkin (~> 2.4.5)
@@ -91,33 +81,31 @@ GEM
       mail (~> 2.2)
       rspec (~> 2.0)
     erubis (2.7.0)
-    execjs (1.2.0)
+    execjs (1.2.4)
       multi_json (~> 1.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
-      rack (< 2, >= 1.1.0)
+      rack (>= 1.1.0, < 2)
     ffaker (1.8.0)
     ffi (1.0.9)
     geo_location (0.4.2)
-    gherkin (2.4.5)
+    gherkin (2.4.8)
       json (>= 1.4.6)
-    has_scope (0.5.0)
-    hike (1.1.0)
+    has_scope (0.5.1)
+    hike (1.2.0)
     i18n (0.6.0)
     inherited_resources (1.2.2)
       has_scope (~> 0.5.0)
       responders (~> 0.6.0)
-    jquery-rails (1.0.12)
+    jquery-rails (1.0.13)
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.5.3)
     json_pure (1.5.3)
     kaminari (0.12.4)
       rails (>= 3.0.0)
-    launchy (0.4.0)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
+    launchy (2.0.3)
     libv8 (3.3.10.2)
     machinist (2.0.0.beta2)
     mail (2.3.0)
@@ -130,8 +118,8 @@ GEM
     modernizr-rails (2.0.6)
     multi_json (1.0.3)
     multi_xml (0.2.2)
-    multipart-post (1.1.2)
-    mysql2 (0.3.6)
+    multipart-post (1.1.3)
+    mysql2 (0.3.7)
     net-ldap (0.2.2)
     nokogiri (1.4.7)
     oa-basic (0.2.6)
@@ -172,42 +160,42 @@ GEM
       oa-oauth (= 0.2.6)
       oa-openid (= 0.2.6)
     orm_adapter (0.0.5)
-    pickle (0.4.7)
+    pickle (0.4.8)
       cucumber (>= 0.8)
       rake
-    polyglot (0.3.1)
+    polyglot (0.3.2)
     pyu-ruby-sasl (0.0.3.3)
-    rack (1.3.0)
+    rack (1.3.2)
     rack-cache (1.0.2)
       rack (>= 0.4)
-    rack-mount (0.8.1)
+    rack-mount (0.8.2)
       rack (>= 1.0.0)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-ssl (1.3.2)
       rack
-    rack-test (0.6.0)
+    rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc4)
-      actionmailer (= 3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activerecord (= 3.1.0.rc4)
-      activeresource (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    rails (3.1.0.rc6)
+      actionmailer (= 3.1.0.rc6)
+      actionpack (= 3.1.0.rc6)
+      activerecord (= 3.1.0.rc6)
+      activeresource (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc4)
+      railties (= 3.1.0.rc6)
     rails_config (0.2.4)
       activesupport (>= 3.0)
-    railties (3.1.0.rc4)
-      actionpack (= 3.1.0.rc4)
-      activesupport (= 3.1.0.rc4)
+    railties (3.1.0.rc6)
+      actionpack (= 3.1.0.rc6)
+      activesupport (= 3.1.0.rc6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.8)
+    rdoc (3.9.2)
     responders (0.6.4)
     rest-client (1.6.3)
       mime-types (>= 1.16)
@@ -229,9 +217,9 @@ GEM
       ruby-openid (>= 2.1.7)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
-    sass (3.1.4)
-    selenium-webdriver (0.2.2)
-      childprocess (>= 0.1.9)
+    sass (3.1.7)
+    selenium-webdriver (2.4.0)
+      childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -241,31 +229,35 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
+    slim (1.0.1)
+      temple (~> 0.3.0)
+      tilt (~> 1.2)
     slim-rails (0.2.1)
       slim (>= 0.9.2)
-    sprockets (2.0.0.beta.10)
-      hike (~> 1.0)
+    sprockets (2.0.0.beta.13)
+      hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
-    squeel (0.8.5)
+      tilt (~> 1.1, != 1.3.0)
+    squeel (0.8.7)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
     subexec (0.1.0)
     temple (0.3.2)
-    term-ansicolor (1.0.5)
-    therubyracer (0.9.2)
+    term-ansicolor (1.0.6)
+    therubyracer (0.9.3)
       libv8 (~> 3.3.10)
     thor (0.14.6)
     tilt (1.3.2)
-    treetop (1.4.9)
+    treetop (1.4.10)
+      polyglot
       polyglot (>= 0.3.1)
     turn (0.8.2)
       ansi (>= 1.2.2)
     tzinfo (0.3.29)
-    uglifier (1.0.0)
+    uglifier (1.0.1)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    warden (1.0.4)
+    warden (1.0.5)
       rack (>= 1.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -299,13 +291,13 @@ DEPENDENCIES
   nested_form!
   omniauth (~> 0.2.0)
   pickle
-  rails (~> 3.1.0.rc4)
+  rails (~> 3.1.0.rc6)
   rails_config
   rspec-rails (~> 2.6.1)
   sass
   simple_form (~> 1.4.0)
   simplecov
-  slim!
+  slim (~> 1.0.0)
   slim-rails
   squeel (~> 0.8.0)
   therubyracer

db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.