Revert "Merge remote branch 'upstream/master'"

This reverts commit 4bb5aeb3, reversing
changes made to fb70dc8c.

app/models/user.rb

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