diff --git a/db/schema.rb b/db/schema.rb
index 24f66bf5cefcf190bdceda874a2df5a89b56e7fa..83c673a0f35acd7c6e4211b2670fe2904ff755dc 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -66,6 +66,19 @@ ActiveRecord::Schema.define(:version => 20110119060243) do
   add_index "contacts", ["user_id", "pending"], :name => "index_contacts_on_user_id_and_pending"
   add_index "contacts", ["user_id", "person_id"], :name => "index_contacts_on_user_id_and_person_id", :unique => true
 
+  create_table "histories", :force => true do |t|
+    t.string   "message"
+    t.string   "username"
+    t.integer  "item"
+    t.string   "table"
+    t.integer  "month",      :limit => 2
+    t.integer  "year",       :limit => 8
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "histories", ["item", "table", "month", "year"], :name => "index_histories_on_item_and_table_and_month_and_year"
+
   create_table "invitations", :force => true do |t|
     t.text     "message"
     t.integer  "sender_id"
diff --git a/features/support/env.rb b/features/support/env.rb
index 45008cdf07f59e84edc28ef9be7d714769852b92..b59524cce45f4ac2f94d4b91379db30ffadc3e85 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -5,7 +5,7 @@
 # files.
 
 ENV["RAILS_ENV"] ||= "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') unless defined?(Rails)
 
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 require 'cucumber/rails/rspec'
diff --git a/features/support/server.rb b/features/support/server.rb
index 8a9cf5c9a899291c2994b55bed91e08035697c89..90b90c72873d02904401b57a64ca8e26cf8afb78 100644
--- a/features/support/server.rb
+++ b/features/support/server.rb
@@ -1,6 +1,6 @@
 
 ENV["RAILS_ENV"] ||= "test"
-require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment') unless defined?(Rails)
 
 require 'timeout'
 require 'socket'
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 47d1a37edc1fd9d0af26cba32fd084936dd09b33..a82909b4fe1dc1ee4a44860dbab9c64fb9e73336 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -12,7 +12,7 @@ rescue MissingSourceFile
         def initialize(name)
           task name do
             # if rspec-rails is a configured gem, this will output helpful material and exit ...
-            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
+            require File.expand_path(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Rails)
 
             # ... otherwise, do this:
             raise <<-MSG