merge in master, only friend tom

app/models/person.rb

@@ -63,7 +63,6 @@ class Person
 
   def remove_all_traces
     self.posts.delete_all
-    Comment.delete_all(:person_id => self.id)
   end
 
   def remove_key

db/seeds/backer.rb

@@ -10,7 +10,7 @@ require 'config/environment'
 
 
 
-def create(backer_number, password)
+def create(backer_number)
   backer_info = [ [5072,"George", "Washington"],
                   [3742,"John", "Adams"],
                   [7782,"Thomas", "Jefferson"],
@@ -62,12 +62,10 @@ def create(backer_number, password)
   #Person.create( :email => "tom@joindiaspora.com", :url => "http://tom.joindiaspora.com/", :active => true, :profile => Profile.new(:first_name => "Alexander", :last_name => "Hamiltom"))
   # Make people
   
-  #(0..10).each { |n|
-    #email = backer_info[n][2].gsub(/ /,'').downcase
-    #Person.create( :email => "#{email}@joindiaspora.com", 
-                  #:url => "http://#{email}.joindiaspora.com/", 
-                  #:active => true, 
-                  #:profile => Profile.new(:first_name => backer_info[n][1], :last_name => backer_info[n][2]))  unless n == backer_number
+#  (0..10).each { |n|
+    #domain_name = backer_info[n][2].gsub(/ /,'').downcase
+    #url = "http://#{domain_name}.joindiaspora.com/"
+    #User.owner.send_friend_request_to(url)
   #}
 end
 

lib/tasks/db.rake

@@ -11,10 +11,10 @@ namespace :db do
       require 'db/seeds/dev'
     end
 
-    task :backer, :num, :password do |t, args|
+    task :backer, :num do |t, args|
       puts "Seeding the database for #{Rails.env}..."
       require 'db/seeds/backer'
-      create( Integer(args.num), args.password )
+      create( Integer(args.num))
     end
   end