diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml
index 82b6b1454..e4084c05d 100644
--- a/app/views/devise/sessions/new.haml
+++ b/app/views/devise/sessions/new.haml
@@ -30,9 +30,10 @@
 
 .span-13.last
   %h1
-    This is a technology preview, do not provide any private information.
+  = t('.tech_preview')
   %h3
-    your account may be deleted until we move into a more stable development period.
+  = t('.account_deletion') 
   %h3
-    USE AT YOUR OWN RISK!!
+  = t('.risk') 
+    
 
diff --git a/app/views/home/show.haml b/app/views/home/show.haml
deleted file mode 100644
index 554e0a766..000000000
--- a/app/views/home/show.haml
+++ /dev/null
@@ -1,56 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-.span-22.prepend-1.last
-
-  #landing_content
-
-    #diaspora_description.section
-      %p
-        = t('.share_what_you_want')
-
-    #why.span-22.prepend-1.last
-      .span-7
-        %h2
-          = t('.choice')
-        %p
-          = t('.choice_explanation')
-          
-      .span-7
-        %h2
-          = t('.ownership')
-        %p
-          = t('.ownership_explanation')
-      .span-7
-        %h2
-          = t('.simplicity')
-        %p
-          = t('.simplicity_explanation')
-
-
-    .span-22.prepend-1.last
-      #signup_field.section
-        = render 'shared/mail_signup_form'
-
-      #login_field.section
-        = t('.already_account')
-        = link_to t('.login_here'), new_user_session_path
-
-    #info_links.span-22.prepend-1.last          
-      .span-10
-        %h3
-          = t('.learn_about_host')
-
-
-      .span-11
-        %h3
-          = t('.learn_about_open_source')
-    
-
-.span-24.last{:style=>"text-align:center;"}
-  %ul#press_logos
-    %li= link_to image_tag("press_logos/nyt.png"), "http://www.nytimes.com/2010/05/12/nyregion/12about.html", :title => "The New York Times"
-    %li= link_to image_tag("press_logos/nymag.gif"), "http://nymag.com/news/features/establishments/68512/", :title => "New York Magazine"
-    %li= link_to image_tag("press_logos/mashable.jpeg"), "http://mashable.com/2010/08/26/facebook-alternative-diaspora-launches-september-15/", :title => "Mashable"
-    %li= link_to image_tag("press_logos/techcrunch.gif"), "http://techcrunch.com/2010/09/15/diaspora-revealed/", :title => "TechCrunch"
diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml
new file mode 100644
index 000000000..a593a9b39
--- /dev/null
+++ b/app/views/home/show.html.haml
@@ -0,0 +1,52 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+#landing_content
+  .span-22.prepend-1.append-1.last
+
+    #diaspora_description.section
+      %p
+        = t('.share_what_you_want')
+
+  #why.span-24.last
+    .span-6.append-3
+      .info_pane
+        %h2
+          = t('.choice')
+        %p
+          = t('.choice_explanation')
+        
+    .span-6.append-3
+      .info_pane
+        %h2
+          = t('.ownership')
+        %p
+          = t('.ownership_explanation')
+    .span-6.last
+      .info_pane
+        %h2
+          = t('.simplicity')
+        %p
+          = t('.simplicity_explanation')
+
+
+  #signup.span-24.last
+    #signup_field.section
+      = render 'shared/mail_signup_form'
+
+    #login_field.section
+      = t('.already_account')
+      = link_to t('.login_here'), new_user_session_path
+
+  #info_links.prepend-1.span-22.append-1.last
+    %h3
+      = link_to t('.learn_about_host'), 'http://bit.ly/dZqyd3'
+      
+
+  .span-24.last{:style=>"text-align:center;"}
+    %ul#press_logos
+      %li= link_to image_tag("press_logos/the_new_york_times_logo.png"), "http://www.nytimes.com/2010/05/12/nyregion/12about.html", :title => "The New York Times"
+      %li= link_to image_tag("press_logos/nymag_logo.png"), "http://nymag.com/news/features/establishments/68512/", :title => "New York Magazine"
+      %li= link_to image_tag("press_logos/mashable_logo.png"), "http://mashable.com/2010/08/26/facebook-alternative-diaspora-launches-september-15/", :title => "Mashable"
+      %li= link_to image_tag("press_logos/techcrunch_logo.png"), "http://techcrunch.com/2010/09/15/diaspora-revealed/", :title => "TechCrunch"
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 4c3bbc1e1..a490b53df 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -4,16 +4,17 @@
 
 .container{:style => "position:relative;"}
   #diaspora_text
-    = link_to "DIASPORA*", (current_user ? root_path : new_user_session_path)
+    = link_to "DIASPORA*", root_path
     %span.sub_text
       ALPHA
 
   - unless current_user
     .right
       %ul#landing_nav
-        %li= link_to t('.blog'), "http://blog.joindiaspora.com"
+        %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
         %li= link_to t('.developers'), "https://github.com/diaspora/diaspora"
-        %li= link_to t('.login'), new_user_session_path
+        %li= link_to t('.login'), new_user_session_path, :class => 'login'
+
   - else
     #global_search
       = form_tag(people_path, :method => 'get') do
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 645e48b72..d737c7ba2 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -64,22 +64,20 @@
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
 
-    %header
+    %header{:class=>('landing' unless current_user)}
       = render 'layouts/header'
 
     .container
       .span-24.last
         = yield
 
-      .span-24.last
-      = render "posts/debug"
     .clearfix
 
     %footer
       .container
         .brandon= t('.powered_by')
         %ul#footer_nav
-          %li= link_to t('layouts.header.blog'), "http://blog.joindiaspora.com"
+          %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
           %li= link_to t('layouts.header.developers'), "https://github.com/diaspora/diaspora"
 
     :javascript    
diff --git a/app/views/shared/_aspect_contacts.haml b/app/views/shared/_aspect_contacts.haml
index b1274f35b..02be8b752 100644
--- a/app/views/shared/_aspect_contacts.haml
+++ b/app/views/shared/_aspect_contacts.haml
@@ -49,7 +49,7 @@
 
 - if (aspect == :all) && @request_count > 0
   #new_request_pane{:class => "everyone"}
-    %h1.new_request
+    %h1.new_request{:style => 'text-align:center'}
       - if @request_count > 1
         = link_to t('.new_requests', :count => @request_count), aspects_manage_path
       - else
diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml
index d749110ed..9d4c02855 100644
--- a/app/views/users/getting_started/_step_4.html.haml
+++ b/app/views/users/getting_started/_step_4.html.haml
@@ -23,16 +23,10 @@
 
 %p
   = t('.change_profile')
-  %b #{t('layouts.header.edit_profile')}
-  = t('.user_menu')
-%p
-  = t('.connect_disconnect')
-  %b #{t('layouts.header.account_settings')}
   = t('.user_menu')
+
 %p
   = t('.manage_aspects')
-  %b #{t('.manage')}
-  = t('.tab_also_added')
 
 .submit_block
   = link_to "#{t('.finish')} →", root_url, :class => "button"
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 77ead1831..49890bab4 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -22,6 +22,9 @@ en:
         sign_in: 'Sign in'
         have_a_problem: "Have a problem? Find an answer here"
         remember_me: "Remember me"
+        tech_preview: "Important, please read: This is a technology preview; do not provide any private information."
+        account_deletion: "Also, be advised that your account may be deleted until we move into a more stable development period."
+        risk: "USE AT YOUR OWN RISK!!!"
       signed_in: 'Signed in successfully.'
       signed_out: 'Signed out successfully.'
     passwords:
@@ -83,4 +86,4 @@ en:
         sign_up: 'Sign up'
         forgot_your_password: 'Forgot your password?'
         receive_confirmation: "Didn't receive confirmation instructions?"
-        receive_unlock: "Didn't receive unlock instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
\ No newline at end of file
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8ef59b734..4ced017ca 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -121,7 +121,7 @@ en:
           contact: "contact"
           contacts: "contacts"
       no_contacts_message:
-          nobody: "We know you know people — bring them to Diaspora!"
+          nobody: "Bring the people that matter in your life to Diaspora!"
           nobody_in_aspect: "Your aspect '%{aspect_name}' is empty."
           add_contact: "Add a contact"
           add_contact_to: "Add someone to %{aspect_name}"
@@ -177,32 +177,30 @@ en:
       destroy: "Account successfully closed."
       getting_started:
           welcome: "Welcome to Diaspora!"
-          signup_steps: "Complete your sign-up by doing these things:"
+          signup_steps: "Finish your sign up by completing these three steps:"
           edit_profile: "Edit your profile"
           define_aspects: "Define your aspects"
-          connect_services: "Connect your services"
+          connect_services: "Connect your other services"
           finished: "Finished!"
           skip: "skip getting started"
           save_and_continue: "Save and continue"
           step_2:
               your_aspects: "Your aspects"
-              description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
+              description: "Tell Diaspora what different aspects of you are seen by different contacts. You can manage these later through your account menu at the top right. Your aspects are unique to you and not visible by others."
               aspect_name: "Aspect name"
               add: "Add"
           step_3:
               your_services: "Your services"
-              description: 'Connect your existing social networks to your Diaspora account.  You will be able to post publically through your Everyone tab when you select "public."'
+              description: 'You are able to connect your existing social networks to your Diaspora account. You will be able to post publically through your Home page when you select “make public"'
           step_4:
               set_up: "You're all set up, %{name}!"
               ready_to_share: "You're now ready to start sharing with "
-              continue: "Continue on to your everyone page, an overview of all of your aspects."
-              change_profile: "You can change your profile any time by clicking"
-              user_menu: "in your user menu (top right)."
+              continue: "Continue on to your Home page, an overview of all of your aspects."
+              change_profile: "You can edit your profile and manage your connected services at any time through "
+              user_menu: "the user menu located at the top right."
               connect_disconnect: "You can connect/disconnect your services any time by clicking"
-              manage_aspects: "You can manage your aspects any time by clicking the"
-              tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
+              manage_aspects: "You can also add contacts while on any aspect page."
               finish: "Finish"
-              manage: "Manage"
       update:
           password_changed: "Password Changed"
           password_not_changed: "Password Change Failed"
@@ -381,5 +379,5 @@ en:
           ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
           simplicity: "Simplicity"
           simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
-          learn_about_host: "Learn about how to host your own Diaspora server"
+          learn_about_host: "Learn about how to host your own Diaspora server."
           learn_about_open_source: "Learn more about Diaspora as an open source project."
diff --git a/features/signs_up.feature b/features/signs_up.feature
index 6ea364578..b91df0a3f 100644
--- a/features/signs_up.feature
+++ b/features/signs_up.feature
@@ -31,9 +31,9 @@ Feature: new user registration
     Then I should see "You're all set up, O!"
     And I should not see "skip getting started"
 
-    When I follow "Continue on to your everyone page, an overview of all of your aspects."
+    When I follow "Continue on to your Home page, an overview of all of your aspects."
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"
 
   Scenario: new user skips the setup wizard and returns to the setup wizard
     When I follow "skip getting started"
@@ -44,4 +44,4 @@ Feature: new user registration
     When I follow "skip getting started"
     And I wait for the aspects page to load
     Then I should be on the aspects page
-    And I should see "bring them to Diaspora!"
+    And I should see "Bring the people that matter in your life to Diaspora!"
diff --git a/public/images/press_logos/Mashable_logo.png b/public/images/press_logos/Mashable_logo.png
new file mode 100644
index 000000000..f6b684ff5
Binary files /dev/null and b/public/images/press_logos/Mashable_logo.png differ
diff --git a/public/images/press_logos/The_New_York_Times_logo.png b/public/images/press_logos/The_New_York_Times_logo.png
new file mode 100644
index 000000000..a2d06f8e9
Binary files /dev/null and b/public/images/press_logos/The_New_York_Times_logo.png differ
diff --git a/public/images/press_logos/mashable.jpeg b/public/images/press_logos/mashable.jpeg
deleted file mode 100644
index 51ef5e9e8..000000000
Binary files a/public/images/press_logos/mashable.jpeg and /dev/null differ
diff --git a/public/images/press_logos/mashable_logo.png b/public/images/press_logos/mashable_logo.png
new file mode 100644
index 000000000..f6b684ff5
Binary files /dev/null and b/public/images/press_logos/mashable_logo.png differ
diff --git a/public/images/press_logos/nymag.gif b/public/images/press_logos/nymag.gif
deleted file mode 100644
index ee3845158..000000000
Binary files a/public/images/press_logos/nymag.gif and /dev/null differ
diff --git a/public/images/press_logos/nymag_logo.png b/public/images/press_logos/nymag_logo.png
new file mode 100644
index 000000000..ab43b6ebf
Binary files /dev/null and b/public/images/press_logos/nymag_logo.png differ
diff --git a/public/images/press_logos/nyt.png b/public/images/press_logos/nyt.png
deleted file mode 100644
index e2d36cd0d..000000000
Binary files a/public/images/press_logos/nyt.png and /dev/null differ
diff --git a/public/images/press_logos/techcrunch.gif b/public/images/press_logos/techcrunch.gif
deleted file mode 100644
index 63bf66859..000000000
Binary files a/public/images/press_logos/techcrunch.gif and /dev/null differ
diff --git a/public/images/press_logos/techcrunch_logo.png b/public/images/press_logos/techcrunch_logo.png
new file mode 100644
index 000000000..5a9d2a0ec
Binary files /dev/null and b/public/images/press_logos/techcrunch_logo.png differ
diff --git a/public/images/press_logos/the_new_york_times_logo.png b/public/images/press_logos/the_new_york_times_logo.png
new file mode 100644
index 000000000..a2d06f8e9
Binary files /dev/null and b/public/images/press_logos/the_new_york_times_logo.png differ
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 69d847ef5..09152a66d 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -138,6 +138,14 @@ header
     :margin
       :right 12px
 
+  &.landing
+    #diaspora_text
+      :font
+        :size 30px
+      :text-shadow 0 2px 3px #000
+    .right
+      :top 10px
+
   ul#user_menu
     :overflow hidden
     :white-space nowrap
@@ -716,7 +724,7 @@ li.message .from .right
     :color #333
 
 #debug_info
-  :margin-top 20px
+  :margin-top 50px
   :color #ccc
 
   h5
@@ -1771,6 +1779,8 @@ ul#landing_nav
   :list
     :style none
 
+  :top 30px
+
   :font
     :size 14px
   
@@ -1780,10 +1790,33 @@ ul#landing_nav
       :right 0.5em
     a
       :color #107FC9
+      
+      &.login
+        :padding 5px 8px
+
+        :-webkit-border-radius 5px
+        :-moz-border-radius 5px
+        :border-radius 5px
+
+        :background
+          :color #000
+
+        :border
+          :top 1px solid #000
+
+        :-webkit-box-shadow 0 1px 1px #666
+        :-moz-box-shadow 0 1px 1px #666
+        :box-shadow 0 1px 1px #666
+
+        &:hover
+          :background
+            :color #222
 
     :text-shadow 0 1px 0 #000
 
 
+
+
 #signup_field
   :margin
     :top -200px
@@ -1890,7 +1923,7 @@ ul#landing_nav
     :style italic
   :margin
     :top 14px
-    :left 500px
+    :left 540px
   :color #888
   
 
@@ -1918,6 +1951,19 @@ ul#press_logos
   :text
     :align center
 
+#why
+  :margin
+    :bottom 48px
+
+  h2
+    :text-shadow 0 1px #fff
+    :border
+      :bottom 3px solid #eee
+
+#signup
+  :margin
+    :bottom 48px
+
 
 h3,h4
   :padding
@@ -1998,3 +2044,4 @@ h3,h4
 #edit_aspect_trigger
   :font
     :size 12px
+
diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml
index 2fce20233..830409f5d 100644
--- a/spec/fixtures/users.yaml
+++ b/spec/fixtures/users.yaml
@@ -1,7 +1,67 @@
 --- 
 :users: 
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:02:59 Z
+=======
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$4r9IZFg5lQJa/V8b9JprIeT798GLSclxM9vzJtNVGBgBw1qGPEe42
+    serialized_private_key: &id002 |
+      -----BEGIN RSA PRIVATE KEY-----
+      MIICXAIBAAKBgQCsXQb71gx3LgeAQBrNGFIPiY7QLPkRozxJLw4Kwbc3FcQefmQU
+      jzGhBLGQTgmVc26CdGuqjzJj6owawp/5cpscpexX0Rd3ODSHqM0mdHAKIuF8IyQL
+      IRrftu7m6SvxI2uhzqTXtuCG9kJ4pLjEYo1vldBM1PvuE78nshgOfHzDwQIDAQAB
+      AoGATzNH3DxU6gaKh9Hs/sToIB+TMfEYWZRqRS6MA0FUEMm9nk1xa0kJAvYHKUnS
+      eYvbAbLBLlQyUVsbGcjIfXS99MDa3/FI0iCwQJ2+DEl2ZA7IGkqNaDBwsD6Vfoqx
+      Y3RqyDukjL5kfObdy6OiqP5bq+7YFwRstOUF+DduAIooQAECQQDZEGGL/wnAW3bX
+      vdE2jbwgYf/6q0HENzRFDmLXRXKb3YtvVxrrSfIxbXHvG597XfJ+LE4/OHNnWezs
+      9Q8GAsyBAkEAy0f8fcYXdXs8u6YOVI8ZyVXwmYELE70wL6Ojkrm+W11anWwq+kPw
+      q6VqiInxh/w98TuWBJo0OBxqjQuJCsdXQQJAcZdY9OIqQDedIZl7+oiBgpDGXG9y
+      ozQgbmLw5qa5K0fsx/9VXvv7elJD5VUXSIAJfm3BJORtwBAXJIm5qvOcAQJBAMjT
+      GD2FOt3EXy6fEZ82NGp0bZqpIrFggT8/MbUdrVKDuqa1GwxdnGFmrQWxCZ2nc+Zj
+      UITBdv9MC3PGRqAQaUECQGp/8X828cHno0glsfMqgqUZT0CFp6jgwyyFLm4avhEe
+      isZr45pbC0PL9OF7lb3VFn7zrzBXLGTP2Jez51mHw2Y=
+      -----END RSA PRIVATE KEY-----
+
+    pending_request_ids: []
+
+    last_sign_in_ip: 
+    invites: 0
+    _id: &id001 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 94
+    last_sign_in_at: 
+    username: bob86b506ff
+    language: en
+    sign_in_count: 0
+    visible_person_ids: []
+
+    password_salt: $2a$10$4r9IZFg5lQJa/V8b9JprIe
+    remember_token: 
+    reset_password_token: 
+    current_sign_in_ip: 
+    remember_created_at: 
+    current_sign_in_at: 
+    invitation_sent_at: 
+    email: bob873ed87b@pivotallabs.com
+    invitation_token: 
+    visible_post_ids: []
+
+    getting_started: true
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -9,6 +69,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 51
         - 55
@@ -16,20 +77,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 129
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 95
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm87ed1f78
       bio: 
       first_name: Robert87777f99
     updated_at: 2010-11-23 08:02:59 Z
+=======
+      last_name: Grimm87fdaf0d
+      bio: 
+      first_name: Robert8722de40
+    updated_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 51
       - 55
@@ -46,12 +124,40 @@
       MIGJAoGBAM+G59ysHdeOSKtae9KyqGTMakj12L56QWQbmRCeSFey66kyw4RzkGG7
       eFMEZXCmOtJkkQUKWP3Txys2YweZaRubxkDeDCSr66rYLQRrgDIrzG6exrVbpeA6
       EEVX+v2IcSmAjqjTyzm7IQyXK4wwKX7kzvRHyWf229sGyk5a4LATAgMBAAE=
+=======
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 96
+    url: http://google-8777c48f.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
       -----END RSA PUBLIC KEY-----
 
-    owner_id: &id001 !ruby/object:BSON::ObjectId 
+    owner_id: *id001
+    diaspora_handle: bob86b506ff@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$cy1.lYsH0.g1qrXnrPdW1.0ttEAQdmtSHfZT0.b5ZxSGNI/lCqUHe
+    serialized_private_key: *id002
+    pending_request_ids: []
+
+    last_sign_in_ip: 
+    invites: 0
+    _id: &id003 !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 51
       - 55
@@ -89,24 +195,51 @@
     _id: *id001
     last_sign_in_at: 
     username: bob867d9fc4
+=======
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 97
+    last_sign_in_at: 
+    username: bob87667df7
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$Y1Q6aU.9mBFFZxrcZYIlD.
+=======
+    password_salt: $2a$10$cy1.lYsH0.g1qrXnrPdW1.
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob87947110@pivotallabs.com
+=======
+    email: bob88bf5388@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:02:59 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -114,6 +247,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 51
         - 55
@@ -121,20 +255,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 129
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 98
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm8897d77e
       bio: 
       first_name: Robert88082241
     updated_at: 2010-11-23 08:02:59 Z
+=======
+      last_name: Grimm88047129
+      bio: 
+      first_name: Robert88736a8c
+    updated_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 51
       - 55
@@ -170,32 +321,89 @@
     diaspora_handle: bob878a464a@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$pVZjeQNn/vvXCB2ohJn2uua6JOZ/0gbs/N.HuKSP6g7QTopwmlIzu
+=======
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 99
+    url: http://google-886a54f8.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id003
+    diaspora_handle: bob87667df7@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$yviJRqeekso2Bk5UF9Mgbehl.KFpDpjmEUkx0L8n07UYQDkfbpLDW
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id003
     last_sign_in_at: 
     username: bob878a464a
+=======
+    invites: 0
+    _id: &id004 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 100
+    last_sign_in_at: 
+    username: bob88429f01
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$pVZjeQNn/vvXCB2ohJn2uu
+=======
+    password_salt: $2a$10$yviJRqeekso2Bk5UF9Mgbe
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob884ff707@pivotallabs.com
+=======
+    email: bob8961d469@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:02:59 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -203,6 +411,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 51
         - 55
@@ -210,20 +419,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 129
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 101
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm89a984dd
       bio: 
       first_name: Robert89fcc077
     updated_at: 2010-11-23 08:02:59 Z
+=======
+      last_name: Grimm89c9c9c5
+      bio: 
+      first_name: Robert89600186
+    updated_at: 2010-11-23 03:22:41 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 51
       - 55
@@ -259,32 +485,89 @@
     diaspora_handle: bob882fbc0c@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$FbNAlEiJR9bZRnPJvLISmOOZlW4yfpQ5ooJBPmgoVGU3w7vF.5K0.
+=======
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 102
+    url: http://google-89880236.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id004
+    diaspora_handle: bob88429f01@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$saHU4SJLoOAgkzP5nXHEvOloGSp23ygqbchr6FitYfxbW50zVS9uW
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id004
     last_sign_in_at: 
     username: bob882fbc0c
+=======
+    invites: 0
+    _id: &id005 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 129
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 103
+    last_sign_in_at: 
+    username: bob895ab4a8
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$FbNAlEiJR9bZRnPJvLISmO
+=======
+    password_salt: $2a$10$saHU4SJLoOAgkzP5nXHEvO
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob89903478@pivotallabs.com
+=======
+    email: bob90db5672@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:02:59 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -292,6 +575,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 51
         - 55
@@ -299,20 +583,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 129
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 104
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm9014bcfd
       bio: 
       first_name: Robert90559501
     updated_at: 2010-11-23 08:02:59 Z
+=======
+      last_name: Grimm90711f8f
+      bio: 
+      first_name: Robert90dfa3f7
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 51
       - 55
@@ -348,32 +649,89 @@
     diaspora_handle: bob89ca7f5b@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$wg0QeGPKwpw3y4OynIvbIucSDmgvZ7amgin7vhlDMP9qcdIxrxgk.
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 105
+    url: http://google-9090fe30.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id005
+    diaspora_handle: bob895ab4a8@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$O/jbgsFQHulESnXRTAFRqutj1YttlBN9P.Dq7tGaPPvf41gx9OFL.
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id005
     last_sign_in_at: 
     username: bob89ca7f5b
+=======
+    invites: 0
+    _id: &id006 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 106
+    last_sign_in_at: 
+    username: bob9033d477
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$wg0QeGPKwpw3y4OynIvbIu
+=======
+    password_salt: $2a$10$O/jbgsFQHulESnXRTAFRqu
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob90187d25@pivotallabs.com
+=======
+    email: bob91512c00@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -381,6 +739,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -388,20 +747,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 107
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm9100c957
       bio: 
       first_name: Robert91d04f7a
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm918abb92
+      bio: 
+      first_name: Robert91f79543
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -437,32 +813,89 @@
     diaspora_handle: bob90302cbd@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$N8YWCf220R00eCxv71qruOvSfJnjU3MZ9ItvTYSwwy9teNCs1j.3e
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 108
+    url: http://google-91972485.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id006
+    diaspora_handle: bob9033d477@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$ac5Ng2x18LSP8Irx5APJdu8mpzQOhXOeOM0DPpo.A8uZfmTkHY19e
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id006
     last_sign_in_at: 
     username: bob90302cbd
+=======
+    invites: 0
+    _id: &id007 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 109
+    last_sign_in_at: 
+    username: bob911e44d4
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$N8YWCf220R00eCxv71qruO
+=======
+    password_salt: $2a$10$ac5Ng2x18LSP8Irx5APJdu
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob911a6739@pivotallabs.com
+=======
+    email: bob92671116@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -470,6 +903,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -477,20 +911,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 110
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm923a04b0
       bio: 
       first_name: Robert928d26da
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm92e35205
+      bio: 
+      first_name: Robert92db6820
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -526,32 +977,89 @@
     diaspora_handle: bob910dcc30@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$OVzwf.dHCZlTHWLjAEY91OFb8a/cRD3YkQEWwV4M.rPP5LR2XgL46
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 111
+    url: http://google-923191e4.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id007
+    diaspora_handle: bob911e44d4@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$pzJ9iEUHaX8hCyP.sYJA4em2jmhflMP8BlbRqV0BdAd4ySuMIA5Nm
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id007
     last_sign_in_at: 
     username: bob910dcc30
+=======
+    invites: 0
+    _id: &id008 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 112
+    last_sign_in_at: 
+    username: bob92e2a817
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$OVzwf.dHCZlTHWLjAEY91O
+=======
+    password_salt: $2a$10$pzJ9iEUHaX8hCyP.sYJA4e
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob9241b6ce@pivotallabs.com
+=======
+    email: bob936df514@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -559,6 +1067,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -566,20 +1075,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 113
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm93572cb5
       bio: 
       first_name: Robert9334ab75
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm931041f1
+      bio: 
+      first_name: Robert933a0614
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -615,32 +1141,89 @@
     diaspora_handle: bob92a84451@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$ScX4hDPEXy8dI2MvilARFO2nDo3PQaFGuYrTLE4lCJ4YWHJQAXcjS
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 114
+    url: http://google-93681413.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id008
+    diaspora_handle: bob92e2a817@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$aOMrEZnL9IyRJ1bkzQdxCujWR9AF7Q6jNc7PkqwJlNH2rUiLz5ltK
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id008
     last_sign_in_at: 
     username: bob92a84451
+=======
+    invites: 0
+    _id: &id009 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 115
+    last_sign_in_at: 
+    username: bob9396970f
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$ScX4hDPEXy8dI2MvilARFO
+=======
+    password_salt: $2a$10$aOMrEZnL9IyRJ1bkzQdxCu
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob93239865@pivotallabs.com
+=======
+    email: bob9440233b@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -648,6 +1231,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -655,20 +1239,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 116
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm941c32cf
       bio: 
       first_name: Robert94f06768
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm94b2b4d0
+      bio: 
+      first_name: Robert943e2645
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -704,32 +1305,89 @@
     diaspora_handle: bob93876ba3@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$vxMxLozMdv/ufLb5x1OEyeoOY6mtM7soOhBseJJ2P/jfeg1DYFpE.
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 117
+    url: http://google-94723257.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id009
+    diaspora_handle: bob9396970f@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$BOw4AZqQh1BuGobw0Yjm7usu7Vawwe.8/GeHZqinTv6fKf8uTho16
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id009
     last_sign_in_at: 
     username: bob93876ba3
+=======
+    invites: 0
+    _id: &id010 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 118
+    last_sign_in_at: 
+    username: bob94eedf8e
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$vxMxLozMdv/ufLb5x1OEye
+=======
+    password_salt: $2a$10$BOw4AZqQh1BuGobw0Yjm7u
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob945371dc@pivotallabs.com
+=======
+    email: bob95b12902@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -737,6 +1395,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -744,20 +1403,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 119
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm9587d9a5
       bio: 
       first_name: Robert95f0439f
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm958fa009
+      bio: 
+      first_name: Robert9595379d
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -793,32 +1469,89 @@
     diaspora_handle: bob94f0ec6b@example.org
   :user: !map:ActiveSupport::HashWithIndifferentAccess 
     encrypted_password: $2a$10$BzTWhaVgvvB/IpWHpEZ3d.bmv0t5VXCtIOu1eqMUWYWFBMh4C39IK
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 120
+    url: http://google-950a0f66.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id010
+    diaspora_handle: bob94eedf8e@example.org
+- :user: !map:ActiveSupport::HashWithIndifferentAccess 
+    encrypted_password: $2a$10$JVCtL1.u/PQRxXEb/cOlueIv/WskopchVd5JUv6livW2HTqja.5Gq
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     serialized_private_key: *id002
     pending_request_ids: []
 
     last_sign_in_ip: 
+<<<<<<< HEAD
     invites: 5
     _id: *id010
     last_sign_in_at: 
     username: bob94f0ec6b
+=======
+    invites: 0
+    _id: &id011 !ruby/object:BSON::ObjectId 
+      data: 
+      - 76
+      - 235
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 121
+    last_sign_in_at: 
+    username: bob956b4c23
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     language: en
     sign_in_count: 0
     visible_person_ids: []
 
+<<<<<<< HEAD
     password_salt: $2a$10$BzTWhaVgvvB/IpWHpEZ3d.
+=======
+    password_salt: $2a$10$JVCtL1.u/PQRxXEb/cOlue
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     remember_token: 
     reset_password_token: 
     current_sign_in_ip: 
     remember_created_at: 
     current_sign_in_at: 
     invitation_sent_at: 
+<<<<<<< HEAD
     email: bob956abea5@pivotallabs.com
+=======
+    email: bob96970228@pivotallabs.com
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     invitation_token: 
     visible_post_ids: []
 
     getting_started: true
+<<<<<<< HEAD
 - :person: !map:ActiveSupport::HashWithIndifferentAccess 
     created_at: 2010-11-23 08:03:00 Z
+=======
+  :person: !map:ActiveSupport::HashWithIndifferentAccess 
+    created_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     profile: !map:ActiveSupport::HashWithIndifferentAccess 
       searchable: true
       image_url: 
@@ -826,6 +1559,7 @@
         data: 
         - 76
         - 235
+<<<<<<< HEAD
         - 117
         - 52
         - 55
@@ -833,20 +1567,37 @@
         - 91
         - 40
         - 113
+=======
+        - 51
+        - 130
+        - 213
+        - 82
+        - 57
+        - 43
+        - 90
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
         - 0
         - 1
         - 122
       gender: 
       diaspora_handle: 
       birthday: 
+<<<<<<< HEAD
       last_name: Grimm963be886
       bio: 
       first_name: Robert9665b010
     updated_at: 2010-11-23 08:03:00 Z
+=======
+      last_name: Grimm967e5b5d
+      bio: 
+      first_name: Robert96512d67
+    updated_at: 2010-11-23 03:22:42 Z
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed
     _id: !ruby/object:BSON::ObjectId 
       data: 
       - 76
       - 235
+<<<<<<< HEAD
       - 117
       - 52
       - 55
@@ -906,3 +1657,25 @@
     visible_post_ids: []
 
     getting_started: true
+=======
+      - 51
+      - 130
+      - 213
+      - 82
+      - 57
+      - 43
+      - 90
+      - 0
+      - 1
+      - 123
+    url: http://google-9657e899.com/
+    serialized_public_key: |
+      -----BEGIN RSA PUBLIC KEY-----
+      MIGJAoGBAKxdBvvWDHcuB4BAGs0YUg+JjtAs+RGjPEkvDgrBtzcVxB5+ZBSPMaEE
+      sZBOCZVzboJ0a6qPMmPqjBrCn/lymxyl7FfRF3c4NIeozSZ0cAoi4XwjJAshGt+2
+      7ubpK/Eja6HOpNe24Ib2QnikuMRijW+V0EzU++4TvyeyGA58fMPBAgMBAAE=
+      -----END RSA PUBLIC KEY-----
+
+    owner_id: *id011
+    diaspora_handle: bob956b4c23@example.org
+>>>>>>> 97171b30836cbeb5d83d42fb514dc7d892763eed