diff --git a/config/deploy.rb b/config/deploy.rb
index bceef51b5..c84d25556 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -27,19 +27,22 @@ set :deploy_via, :checkout
 #
 set :rails_env, ENV['rails_env'] || ENV['RAILS_ENV'] || all['default_env']
 
-role :pivots, config['servers']['pivots']['url']
+role :tom,    "tom.joindiaspora.com"
+backers.each{ |backer|
+  role :backer, "#{backer['username']}.joindiaspora.com", :number => backer['number']
+}
 
+#role :ci, "ci.joindiaspora.com"
 # If you are using Passenger mod_rails uncomment this:
 # if you're still using the script/reapear helper you will need
 # these http://github.com/rails/irs_process_scripts
 
 # Start Nginx
 after "deploy:cold" do
-  run("nginx")
+  #run("nginx")
 end
 
 namespace :deploy do
-
   task :symlink_images do
     run "mkdir -p #{shared_path}/uploads"
     run "ln -s -f #{shared_path}/uploads #{current_path}/public/uploads"
@@ -61,25 +64,20 @@ namespace :deploy do
   end
 
   task :start_mongo do
-		run("mkdir -p -v #{current_path}/log/db/ ")
-    run("mkdir -p -v #{shared_path}/db/")
-		run("mongod  --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
+      run("mkdir -p -v #{current_path}/log/db/ ")
+      run("mkdir -p -v #{shared_path}/db/")
+      run("mongod  --fork --logpath #{current_path}/log/db/mongolog.txt --dbpath #{shared_path}/db/ " )
   end
 
   task :start_thin do
-		run("mkdir -p -v #{current_path}/log/thin/ ")
-		run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
+      run("mkdir -p -v #{current_path}/log/thin/ ")
+      run("cd #{current_path} && bundle exec thin start -C config/thin.yml")
   end
 
   task :stop do
     stop_thin
     run("killall -s 2 mongod || true")
   end
- 
-  task :go_cold do
-    stop
-    run("killall nginx")
-  end
 
   task :stop_thin do
     run("killall -s 2 ruby || true")
@@ -121,13 +119,32 @@ namespace :cloud do
   end
 end
 namespace :db do
-  
-  task :purge, :roles => [:pivots] do
+
+  task :purge, :roles => [:tom, :backer] do
     run "cd #{current_path} && bundle exec rake db:purge --trace RAILS_ENV=#{rails_env}"
   end
-  
+
+  task :tom_seed, :roles => :tom do
+    run "cd #{current_path} && bundle exec rake db:seed:tom --trace RAILS_ENV=#{rails_env}"
+    run "curl -silent -u tom@tom.joindiaspora.com:evankorth http://tom.joindiaspora.com/zombiefriends"
+    backers.each do |backer|
+      run "curl -silent -u  #{backer['username']}@#{backer['username']}.joindiaspora.com:#{backer['username']}#{backer['pin']} http://#{backer['username']}.joindiaspora.com/zombiefriendaccept"
+      #run "curl -silent -u  #{backer['username']}@#{backer['username']}.joindiaspora.com:#{backer['username']}#{backer['pin']} http://#{backer['username']}.joindiaspora.com/set_profile_photo"
+    end
+
+  end
+
+  task :backer_seed, :roles => :backer do
+    (0..10).each { |n|
+      run "curl -silent http://localhost/set_backer_number?number=#{n}", :only => {:number => n}
+    }
+    run "cd #{current_path} && bundle exec rake db:seed:backer --trace RAILS_ENV=#{rails_env}"
+  end
+
   task :reset do
     purge
+    backer_seed
+    tom_seed
   end
 
 
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 01bd94470..c653b6565 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -7,9 +7,65 @@
 cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
-  branch: 'production'
   repo: 'git@github.com:diaspora/diaspora.git'
-  default_env: 'production'
+  branch: 'master'
+  default_env: 'development'
 servers:
-  pivots:
-    url: 'pivots.joindiaspora.com'
+  tom:
+    - url: 'tom.joindiaspora.com'
+  backer:
+    - username: 'washington'
+      given_name: 'George'
+      family_name: 'Washington'
+      number: 0
+      pin: 5072
+    - username: 'adams'
+      given_name: 'John'
+      family_name: 'Adams'
+      number: 1
+      pin: 3742
+    - username: 'jefferson'
+      given_name: 'Thomas'
+      family_name: 'Jefferson'
+      number: 2
+      pin: 7782
+    - username: 'madison'
+      given_name: 'James'
+      family_name: 'Madison'
+      number: 3
+      pin: 2691
+    - username: 'monroe'
+      given_name: 'James'
+      family_name: 'Monroe'
+      number: 4
+      pin: 6133
+    - username: 'quincyadams'
+      given_name: 'John Quincy'
+      family_name: 'Adams'
+      number: 5
+      pin: 7558
+    - username: 'jackson'
+      given_name: 'Andrew'
+      family_name: 'Jackson'
+      number: 6
+      pin: 8670
+    - username: 'buren'
+      given_name: 'Martin'
+      family_name: 'Van Buren'
+      number: 7
+      pin: 1559
+    - username: 'harrison'
+      given_name: 'William Henry'
+      family_name: 'Harrison'
+      number: 8
+      pin: 5404
+    - username: 'tyler'
+      given_name: 'John'
+      family_name: 'Tyler'
+      number: 9
+      pin: 6431
+    - username: 'polk'
+      given_name: 'James K.'
+      family_name: 'Polk'
+      number: 10
+      pin: 1957