diff --git a/Gemfile b/Gemfile
index f2b895e32..660c818b0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,9 +1,9 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0.rc'
-gem 'bundler', '1.0.0.rc.5'
-#gem 'rails', '3.0.0.beta4'
-#gem 'bundler', '0.9.26'
+#gem 'rails', '3.0.0.rc'
+#gem 'bundler', '1.0.0.rc.5'
+gem 'rails', '3.0.0.beta4'
+gem 'bundler', '0.9.26'
 
 #Security
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
diff --git a/config/application.rb b/config/application.rb
index 206139b5e..bbceb6f94 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -15,7 +15,7 @@ module Diaspora
     # -- all .rb files in that directory are automatically loaded.
 
     # Add additional load paths for your own custom dirs
-     config.autoload_paths += %W(#{config.root}/lib)
+     #config.autoload_paths += %W(#{config.root}/lib)
      
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named