Revert "Revert "Merge remote branch 'upstream/master'""

This reverts commit 3faca838.

app/models/user.rb

@@ -64,7 +64,7 @@ class User
 
   #after_create :seed_aspects
 
-  before_destroy :unfriend_everyone, :remove_person, :remove_all_aspects
+  before_destroy :unfriend_everyone, :remove_person
 
   def strip_username
     if username.present?
@@ -436,8 +436,4 @@ class User
       end
     }
   end
-  
-  def remove_all_aspects
-    aspects.destroy_all
-  end
 end