diff --git a/app/models/user.rb b/app/models/user.rb
index 7ab2987d9..80241fbed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -21,6 +21,8 @@ class User
   
   ######## Making things work ########
   key :email, String
+  validates_true_for :email, :logic => lambda {
+    email.include?('@pivotallabs.com') || email.include?('@pivotalsf.com')}
 
   def method_missing(method, *args)
     self.person.send(method, *args)
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 0dc2c9b99..48d9f701a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -10,10 +10,10 @@ Diaspora::Application.configure do
   config.action_controller.perform_caching = true
 
   # 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 nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+   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
@@ -29,7 +29,7 @@ Diaspora::Application.configure do
 
   # Disable Rails's static asset server
   # In production, Apache or nginx will already do this
-  config.serve_static_assets = true
+  #config.serve_static_assets = true
 
   # Enable serving of images, stylesheets, and javascripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
@@ -37,9 +37,6 @@ Diaspora::Application.configure do
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
-  # Enable threaded mode
-  # config.threadsafe!
-
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
diff --git a/config/thin.yml b/config/thin.yml
index f60fed103..fa84529dd 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -8,8 +8,8 @@ require: []
 
 max_persistent_conns: 512
 environment: production
-servers: 1
+servers: 4
 daemonize: true
 #chdir: /usr/applications/localhash/current
-#socket: /tmp/thin.sock
-port: 80
+socket: /tmp/thin.sock
+#port: 80
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index c8b1d41a6..10a7e910e 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -1,6 +1,7 @@
 require 'config/environment'
 
 remote_url = "http://tom.joindiaspora.com/"
+remote_url = "http://localhost:3000/"
 # Create seed user
 user = User.create!( :email => "tom@tom.joindiaspora.com",
                     :password => "evankorth",