diff --git a/.gitignore b/.gitignore
index 0025a86f5..d02467332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,8 @@ gpg/diaspora-production/*.gpg
 gpg/*/random_seed
 public/uploads/*
 .rvmrc
+.DS_Store
 config/app_config.yml
+bin/*
+nbproject
+config/initializers/secret_token.rb
diff --git a/COPYRIGHT b/COPYRIGHT
index f1bed1a6b..b150ae948 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -16,8 +16,8 @@ including the two.
 
 You must obey the GNU Affero General Public License V3 or later in all respects
 for all of the code used other than OpenSSL or the components mentioned
-above.  If you modify file(s) with this exception, you may extend this 
-exception to your version of the file(s), but you are not obligated to 
+above.  If you modify file(s) with this exception, you may extend this
+exception to your version of the file(s), but you are not obligated to
 do so.  If you do not wish to do so, delete this exception statement from your
-version.  If you delete this exception statement from all source files in the 
+version.  If you delete this exception statement from all source files in the
 program, then also delete it here.
diff --git a/Capfile b/Capfile
index af77f235a..306a9d64b 100644
--- a/Capfile
+++ b/Capfile
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 load 'deploy' if respond_to?(:namespace) # cap2 differentiator
 Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
 
diff --git a/Gemfile b/Gemfile
index cc92bec3d..16788eeb3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,13 +3,11 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0'
 gem 'bundler', '1.0.0'
 
-
 #Security
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 
 #Mongo
-gem 'mongo_mapper', '0.8.4', :git => 'http://github.com/jnunemaker/mongomapper.git'
-gem 'jnunemaker-validatable', '1.8.4', :git => 'http://github.com/jnunemaker/validatable.git'
+gem 'mongo_mapper', :branch => 'rails3', :git => 'http://github.com/jnunemaker/mongomapper.git'
 gem 'bson_ext', '1.0.7'
 gem 'bson', '1.0.7'
 
@@ -21,6 +19,7 @@ gem 'will_paginate', '3.0.pre2'
 gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
 gem 'addressable', :require => 'addressable/uri'
 gem 'json'
+gem 'mini_fb'
 
 #Standards
 gem 'pubsubhubbub'
@@ -40,24 +39,23 @@ gem 'mini_magick'
 
 group :test, :development do
   gem 'factory_girl_rails'
+  gem 'ruby-debug' if RUBY_VERSION.include? "1.8"
 end
 
 group :test do
-	gem 'rspec', '>= 2.0.0.beta.17'
-	gem 'rspec-rails', '2.0.0.beta.17'
+  gem 'capybara', '~> 0.3.9'
+  gem 'cucumber-rails', '0.3.2'
+  gem 'rspec', '>= 2.0.0.beta.17'
+  gem 'rspec-rails', '2.0.0.beta.17'
   gem 'mocha'
-  gem 'webrat', '0.7.2.beta.1'
-  gem 'redgreen'
+  gem 'redgreen' if RUBY_VERSION.include? "1.8"
   gem 'autotest'
   gem 'database_cleaner'
-  gem 'saucelabs-adapter', '= 0.8.12'
-  gem 'selenium-rc'
   gem 'webmock'
 end
 
 group :development do
   gem 'nifty-generators'
-  gem 'ruby-debug'
 end
 
 group :deployment do
diff --git a/Gemfile.lock b/Gemfile.lock
index dd181b320..8534f580a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -57,20 +57,14 @@ GIT
 
 GIT
   remote: http://github.com/jnunemaker/mongomapper.git
-  revision: 931dab779011aa7acf60c1a4c7ad19e1ba838345
+  revision: b0eac421ef5b3bee782e15d391eca372a189d414
+  branch: rails3
   specs:
     mongo_mapper (0.8.4)
-      activesupport (>= 2.3.4)
-      jnunemaker-validatable (~> 1.8.4)
+      activemodel (~> 3.0.0)
+      activesupport (~> 3.0.0)
       plucky (~> 0.3.5)
 
-GIT
-  remote: http://github.com/jnunemaker/validatable.git
-  revision: 8d7c3ce14133760e748a0e34b99dfe6ec4d69153
-  specs:
-    jnunemaker-validatable (1.8.4)
-      activesupport (>= 2.3.4)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -115,8 +109,24 @@ GEM
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.0.0)
+    capybara (0.3.9)
+      culerity (>= 0.2.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (>= 0.0.3)
     columnize (0.3.1)
     crack (0.1.8)
+    cucumber (0.9.0)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.12)
     daemons (1.1.0)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
@@ -130,18 +140,27 @@ GEM
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
       rails (>= 3.0.0.beta4)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.2.4)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+      trollop (~> 1.16.2)
     haml (3.0.18)
     hashie (0.4.0)
     highline (1.6.1)
     i18n (0.4.1)
     json (1.4.6)
+    json_pure (1.4.6)
     linecache (0.43)
-    lsof (0.3.0)
     mail (2.2.6.1)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
+    mini_fb (1.1.3)
+      hashie
+      rest-client
     mini_magick (2.1)
       subexec (~> 0.0.4)
     mocha (0.9.8)
@@ -203,16 +222,13 @@ GEM
       ruby-debug-base (~> 0.10.3.0)
     ruby-debug-base (0.10.3)
       linecache (>= 0.3)
-    saucelabs-adapter (0.8.12)
-      lsof (>= 0.3.0)
-      net-ssh (>= 2.0.12)
-      net-ssh-gateway (>= 1.0.1)
-      rest-client (>= 1.2.0)
-      selenium-client (>= 1.2.17)
-    selenium-client (1.2.18)
-    selenium-rc (2.2.4)
-      selenium-client (>= 1.2.18)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.0.28)
+      ffi (>= 0.6.1)
+      json_pure
+      rubyzip
     subexec (0.0.4)
+    term-ansicolor (1.0.5)
     thin (1.2.7)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -220,6 +236,7 @@ GEM
     thor (0.14.0)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
+    trollop (1.16.2)
     tzinfo (0.3.23)
     uuidtools (2.1.1)
     warden (0.10.7)
@@ -242,19 +259,21 @@ DEPENDENCIES
   bson (= 1.0.7)
   bson_ext (= 1.0.7)
   bundler (= 1.0.0)
+  capybara (~> 0.3.9)
   carrierwave!
+  cucumber-rails (= 0.3.2)
   database_cleaner
   devise!
   em-http-request!
   em-websocket
   factory_girl_rails
   haml
-  jnunemaker-validatable (= 1.8.4)!
   json
   magent!
+  mini_fb
   mini_magick
   mocha
-  mongo_mapper (= 0.8.4)!
+  mongo_mapper!
   nifty-generators
   pubsubhubbub
   rails (= 3.0.0)
@@ -264,10 +283,7 @@ DEPENDENCIES
   rspec (>= 2.0.0.beta.17)
   rspec-rails (= 2.0.0.beta.17)
   ruby-debug
-  saucelabs-adapter (= 0.8.12)
-  selenium-rc
   sprinkle!
   thin
   webmock
-  webrat (= 0.7.2.beta.1)
   will_paginate (= 3.0.pre2)
diff --git a/README.md b/README.md
index 97ec66834..f21676bdd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,18 @@
+# Diaspora
+
+The privacy aware, personally controlled, do-it-all, open source social
+network.
+
+**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
+**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
+TO BE BROKEN**
+
+Initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
+
+We are continuing to build features and improve the code base.
+When we think it is ready for general use, we will post more final
+instructions.
+
 ## Commit Guidlines
 
 You are welcome to contribute, add to and extend Diaspora however you see fit.  We
@@ -17,23 +32,6 @@ Nokogiri, Mongomapper, and EM::HttpRequest as much as possible.  We have a few
 gems in the project we'd rather not use, but if you can, use dependencies we
 already have.
 
-# Diaspora
-
-The privacy aware, personally controlled, do-it-all, open source social
-network.
-
-**DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
-**PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
-TO BE BROKEN**
-
-Some initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
-
-We are continuing to build features and improve the code base.
-When we think it is ready for general use, we will post more final
-instructions.
-
-
-
 ## Resources
 
 We are maintaining a
diff --git a/Rakefile b/Rakefile
index c9b50786e..fa9be254a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,12 +2,11 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 require File.expand_path('../config/application', __FILE__)
 require 'rake'
 ENV['GNUPGHOME'] = File.expand_path("../../gpg/diaspora-#{Rails.env}/", __FILE__)
+
 Diaspora::Application.load_tasks
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f0ca5bfc8..52975730b 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,13 +2,13 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class ApplicationController < ActionController::Base
 
   protect_from_forgery :except => :receive
 
   before_filter :set_friends_and_status, :except => [:create, :update]
   before_filter :count_requests
+  before_filter :fb_user_info
 
   layout :layout_by_resource
 
@@ -22,7 +22,9 @@ class ApplicationController < ActionController::Base
 
   def set_friends_and_status
     if current_user
-      if params[:aspect] == nil || params[:aspect] == 'all'
+      if params[:action] == 'public'
+        @aspect = :public
+      elsif params[:aspect] == nil || params[:aspect] == 'all'
         @aspect = :all
       else
         @aspect = current_user.aspect_by_id( params[:aspect])
@@ -37,4 +39,11 @@ class ApplicationController < ActionController::Base
     @request_count = Request.for_user(current_user).size if current_user
   end
 
+  def fb_user_info
+    if current_user
+      @access_token = warden.session[:access_token]
+      @logged_in = @access_token.present?
+    end
+  end
+
 end
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index bf24e56f9..a5e93ac0b 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class AspectsController < ApplicationController
   before_filter :authenticate_user!
 
@@ -15,8 +14,12 @@ class AspectsController < ApplicationController
   end
 
   def create
-    @aspect = current_user.aspect params[:aspect]
-    flash[:notice] = I18n.t('aspects.create.success')
+    @aspect = current_user.aspect(params[:aspect])
+    if @aspect.valid?
+      flash[:notice] = I18n.t('aspects.create.success')
+    else
+      flash[:error] = I18n.t('aspects.create.failure')
+    end
     respond_with :location => aspects_manage_path
   end
 
@@ -45,6 +48,15 @@ class AspectsController < ApplicationController
     respond_with @aspect
   end
 
+  def public
+    @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create",
+                                      :scope=>MiniFB.scopes.join(","))
+
+    @posts = current_user.visible_posts(:public => true).paginate :page => params[:page], :per_page => 15, :order => 'created_at DESC'
+
+    respond_with @aspect
+  end
+  
   def manage
     @aspect = :manage
     @remote_requests = Request.for_user(current_user).all
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index fe11cb8ae..d1efc3e10 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class CommentsController < ApplicationController
   before_filter :authenticate_user!
 
diff --git a/app/controllers/dev_utilities_controller.rb b/app/controllers/dev_utilities_controller.rb
index 30d1a1799..e8a40a4c2 100644
--- a/app/controllers/dev_utilities_controller.rb
+++ b/app/controllers/dev_utilities_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class DevUtilitiesController < ApplicationController
   before_filter :authenticate_user!, :except => [:set_backer_number]
   include ApplicationHelper
@@ -16,7 +15,7 @@ class DevUtilitiesController < ApplicationController
       bkr_info.each do |backer|
         backer_email = "#{backer['username']}@#{backer['username']}.joindiaspora.com"
         rel_hash = relationship_flow(backer_email)
-        logger.info "Zombefriending #{backer['given_name']} #{backer['family_name']}"
+        logger.info "Zombiefriending #{backer['given_name']} #{backer['family_name']}"
         logger.info "Calling send_friend_request with #{rel_hash[:friend]} and #{current_user.aspects.first}"
         current_user.send_friend_request_to(rel_hash[:friend], current_user.aspects.first)
       end
@@ -30,11 +29,6 @@ class DevUtilitiesController < ApplicationController
     }
   end
 
-  def backer_info
-    config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
-    config['servers']['backer']
-  end
-
   def set_backer_number
     render :nothing => true
     seed_num_hash = {:seed_number => params[:number]}
@@ -44,7 +38,6 @@ class DevUtilitiesController < ApplicationController
   end
 
   def set_profile_photo
-
     render :nothing => true
     album = Album.create(:person => current_user.person, :name => "Profile Photos")
     current_user.raw_visible_posts << album
@@ -53,7 +46,7 @@ class DevUtilitiesController < ApplicationController
     backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
     username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
 
-      @fixture_name = File.dirname(__FILE__) + "/../../public/images/user/#{username}.jpg"
+      @fixture_name = File.join(File.dirname(__FILE__), "..", "..", "public", "images", "user", "#{username}.jpg")
 
       photo = Photo.new(:person => current_user.person, :album => album)
       photo.image.store! File.open(@fixture_name)
@@ -63,7 +56,6 @@ class DevUtilitiesController < ApplicationController
       current_user.raw_visible_posts << photo
       current_user.save
 
-
      current_user.update_profile(:image_url => photo.url(:thumb_medium))
      current_user.save
   end
@@ -73,4 +65,11 @@ class DevUtilitiesController < ApplicationController
 
     render "shared/log"
   end
+
+  protected
+
+  def backer_info
+    config = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "config", "deploy_config.yml"))
+    config['servers']['backer']
+  end
 end
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 08acdd424..be1f89991 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class PeopleController < ApplicationController
   before_filter :authenticate_user!
 
@@ -22,7 +21,7 @@ class PeopleController < ApplicationController
     @profile = @person.profile
     @aspects_with_person = current_user.aspects_with_person(@person)
     @aspects_dropdown_array = current_user.aspects.collect{|x| [x.to_s, x.id]}
-    @posts = current_user.visible_posts(:from => @person).paginate :page => params[:page], :order => 'created_at DESC'
+    @posts = current_user.visible_posts(:person_id => @person.id).paginate :page => params[:page], :order => 'created_at DESC'
     @latest_status_message = current_user.raw_visible_posts.find_all_by__type_and_person_id("StatusMessage", params[:id]).last
     @post_count = @posts.count
     respond_with @person
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 3433c0cf4..4d865573c 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class PhotosController < ApplicationController
   before_filter :authenticate_user!
 
@@ -19,9 +18,15 @@ class PhotosController < ApplicationController
       # get file content type
       att_content_type = (request.content_type.to_s == "") ? "application/octet-stream" : request.content_type.to_s
       # create temporal file
-      file = Tempfile.new(file_name)
+      begin
+        file = Tempfile.new(file_name, {:encoding =>  'BINARY'})
+        file.print request.raw_post.force_encoding('BINARY')
+      rescue RuntimeError => e
+        raise e unless e.message.include?('cannot generate tempfile')
+        file = Tempfile.new(file_name) # Ruby 1.8 compatibility
+        file.print request.raw_post
+      end
       # put data into this file from raw post request
-      file.print request.raw_post
 
       # create several required methods for this temporal file
       Tempfile.send(:define_method, "content_type") {return att_content_type}
@@ -29,12 +34,10 @@ class PhotosController < ApplicationController
 
       ##############
 
-
       params[:user_file] = file
 
       data = clean_hash(params)
 
-
       @photo = current_user.post(:photo, data)
 
       respond_to do |format|
@@ -97,7 +100,6 @@ class PhotosController < ApplicationController
     end
   end
 
-
   private
   def clean_hash(params)
     if params[:photo]
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 5046aa900..e3c90fc16 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -2,10 +2,10 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class PublicsController < ApplicationController
-  require 'lib/diaspora/parser'
+  require File.expand_path('../../../lib/diaspora/parser', __FILE__)
   include Diaspora::Parser
+
   layout false
 
   def hcard
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 44e1a8016..31c6e6efd 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class RequestsController < ApplicationController
   before_filter :authenticate_user!
   include RequestsHelper
@@ -42,8 +41,6 @@ class RequestsController < ApplicationController
       return
     end
 
-
-
     # rel_hash = {:friend => params[:friend_handle]}
     Rails.logger.debug("Sending request: #{rel_hash}")
 
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
new file mode 100644
index 000000000..82a58c508
--- /dev/null
+++ b/app/controllers/services_controller.rb
@@ -0,0 +1,40 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+class ServicesController < ApplicationController
+
+  def create
+    puts 'services/create'
+    p params
+
+    code = params['code'] # Facebooks verification string
+    if code
+      access_token_hash = MiniFB.oauth_access_token(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create", FB_SECRET, code)
+      p access_token_hash
+      @access_token = access_token_hash["access_token"]
+
+      # TODO: This is where you'd want to store the token in your database
+      # but for now, we'll just keep it in the session so we don't need a database
+      warden.session[:access_token] = @access_token
+      flash[:success] = "Authentication successful."
+    end
+    redirect_to edit_user_url current_user
+  end
+
+  def destroy
+    warden.session[:access_token] = nil
+		warden.session[:user_id] = nil
+    redirect_to edit_user_url current_user
+  end
+
+  def fb_post
+    id = 'me'
+    type = 'feed'
+
+    @res = MiniFB.post(@access_token, id, :type=>type, :metadata=>true, :params=>params)
+    redirect_to edit_user_url current_user
+  end
+
+end
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index 9b90ea831..88d8e6b40 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class SocketsController < ApplicationController
   include ApplicationHelper
   include SocketsHelper
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 5a8efbe06..b072564bb 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
 
@@ -13,6 +12,15 @@ class StatusMessagesController < ApplicationController
     params[:status_message][:to] = params[:aspect_ids]
 
     data = clean_hash params[:status_message]
+    
+    if @logged_in && params[:status_message][:public] == 'true'
+      id = 'me'
+      type = 'feed'
+      
+      Rails.logger.info("Sending a message: #{params[:status_message][:message]} to Facebook")
+      @res = MiniFB.post(@access_token, id, :type=>type,
+                         :metadata=>true, :params=>{:message => params[:status_message][:message]})
+    end
 
     @status_message = current_user.post(:status_message, data)
     respond_with @status_message
@@ -33,7 +41,8 @@ class StatusMessagesController < ApplicationController
   def clean_hash(params)
     return {
       :message => params[:message],
-      :to      => params[:to]
+      :to      => params[:to],
+      :public  => params[:public]
     }
   end
 end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index dbb69d1a2..1cc280577 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,17 +2,21 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class UsersController < ApplicationController
-  before_filter :authenticate_user!, :except => [:new, :create]
+  require File.expand_path('../../../lib/diaspora/ostatus_builder', __FILE__)
+
+  before_filter :authenticate_user!, :except => [:new, :create, :public]
 
   respond_to :html
 
   def edit
     @user    = current_user
     @person  = @user.person
-    @profile = @user.profile
+    @profile = @user.person.profile
     @photos  = Photo.find_all_by_person_id(@person.id).paginate :page => params[:page], :order => 'created_at DESC'
+
+    @fb_access_url = MiniFB.oauth_url(FB_APP_ID, APP_CONFIG[:pod_url] + "services/create",
+                                      :scope=>MiniFB.scopes.join(","))
   end
 
   def update
@@ -25,12 +29,31 @@ class UsersController < ApplicationController
     respond_with(@user, :location => root_url)
   end
 
+  def public
+    user = User.find_by_username(params[:username])
+
+    if user
+      director = Diaspora::Director.new
+      ostatus_builder = Diaspora::OstatusBuilder.new(user)
+
+      render :xml => director.build(ostatus_builder)
+    else
+      flash[:error] = "User #{params[:username]} does not exist!"
+      redirect_to root_url
+    end
+  end
+
   private
   def prep_image_url(params)
+    url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'
     if params[:profile][:image_url].empty?
       params[:profile].delete(:image_url)
     else
-      params[:profile][:image_url] = "http://" + request.host + ":" + request.port.to_s + params[:profile][:image_url]
+      if /^http:\/\// =~ params[:profile][:image_url]
+        params[:profile][:image_url] = params[:profile][:image_url]
+      else
+        params[:profile][:image_url] = url + params[:profile][:image_url]
+      end
     end
   end
 
diff --git a/app/helpers/albums_helper.rb b/app/helpers/albums_helper.rb
index 9a1e78fd1..6d85c747c 100644
--- a/app/helpers/albums_helper.rb
+++ b/app/helpers/albums_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module AlbumsHelper
   def friends_albums_link
     if params[:friends]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 89df26155..7745ace96 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module ApplicationHelper
   def current_aspect?(aspect)
     !@aspect.is_a?(Symbol) && @aspect.id == aspect.id
@@ -67,4 +66,9 @@ module ApplicationHelper
   def post_yield_tag(post)
     (':' + post.id.to_s).to_sym
   end
+
+  def connected_fb_as token
+    response_hash = MiniFB.get(token, 'me')
+    "Connected to facebook as #{response_hash[:name]}"
+  end
 end
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index 536bb8b0b..66baffca2 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module AspectsHelper
   def link_for_aspect( aspect )
     link_to aspect.name, aspect
diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index 271b68253..e8a9d8f71 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module DashboardsHelper
   def title_for_page
     I18n.t('dashboards.helper.home')
diff --git a/app/helpers/error_messages_helper.rb b/app/helpers/error_messages_helper.rb
index 274d60edf..9a64dca36 100644
--- a/app/helpers/error_messages_helper.rb
+++ b/app/helpers/error_messages_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module ErrorMessagesHelper
   # Render error messages for the given objects. The :message and :header_message options are allowed.
   def error_messages_for(*objects)
diff --git a/app/helpers/layout_helper.rb b/app/helpers/layout_helper.rb
index 2398771a3..e33556c35 100644
--- a/app/helpers/layout_helper.rb
+++ b/app/helpers/layout_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # These helper methods can be called in your template to set variables to be used in the layout
 # This module should be included in all views globally,
 # to do so you may need to add this line to your ApplicationController
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index 90ffb517d..f1fa6487f 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module PeopleHelper
 
   def search_or_index
diff --git a/app/helpers/photos_helper.rb b/app/helpers/photos_helper.rb
index 2737d3a2d..1f52daa0c 100644
--- a/app/helpers/photos_helper.rb
+++ b/app/helpers/photos_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module PhotosHelper
   def linked_scaled_photo(photo, album)
     link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
diff --git a/app/helpers/publics_helper.rb b/app/helpers/publics_helper.rb
index 46e778e2b..f14fad7a6 100644
--- a/app/helpers/publics_helper.rb
+++ b/app/helpers/publics_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module PublicsHelper
   def subscribe(opts = {})
     subscriber = Subscriber.first(:url => opts[:callback], :topic => opts[:topic])
diff --git a/app/helpers/requests_helper.rb b/app/helpers/requests_helper.rb
index fec093aac..98ccc8f75 100644
--- a/app/helpers/requests_helper.rb
+++ b/app/helpers/requests_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module RequestsHelper
   def subscription_mode(profile)
     if diaspora?(profile)
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index 69135092a..892e15f59 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module SocketsHelper
  include ApplicationHelper
 
diff --git a/app/helpers/status_messages_helper.rb b/app/helpers/status_messages_helper.rb
index 7c1322762..08461b635 100644
--- a/app/helpers/status_messages_helper.rb
+++ b/app/helpers/status_messages_helper.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 module StatusMessagesHelper
   def my_latest_message
     unless @latest_status_message.nil?
diff --git a/app/models/album.rb b/app/models/album.rb
index 10737bdfa..f62cbdb79 100644
--- a/app/models/album.rb
+++ b/app/models/album.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Album < Post
 
   xml_reader :name
@@ -17,7 +16,6 @@ class Album < Post
 
   before_destroy :destroy_photos
 
-
   def self.mine_or_friends(friend_param, current_user)
     friend_param ? Album.find_all_by_person_id(current_user.friend_ids) : current_user.person.albums
   end
diff --git a/app/models/aspect.rb b/app/models/aspect.rb
index b60142671..10f7aba14 100644
--- a/app/models/aspect.rb
+++ b/app/models/aspect.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Aspect
   include MongoMapper::Document
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 3fa986503..4bf0dbd5e 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Comment
   include MongoMapper::Document
   include ROXML
@@ -19,7 +18,6 @@ class Comment
   key :post_id,   ObjectId
   key :person_id, ObjectId
 
-
   belongs_to :post,   :class_name => "Post"
   belongs_to :person, :class_name => "Person"
 
diff --git a/app/models/fb_status.rb b/app/models/fb_status.rb
new file mode 100644
index 000000000..fd190c2c7
--- /dev/null
+++ b/app/models/fb_status.rb
@@ -0,0 +1,31 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+class FbStatus 
+  include MongoMapper::Document
+
+  key :graph_id, String
+  key :author_id, String
+  key :author_name, String
+  key :message, String
+  key :updated_time, Time 
+
+  timestamps!
+
+  validates_presence_of :graph_id,:author_id,:author_name,:message,:updated_time
+
+  def self.from_api(hash)
+    #just keeping them in memory for now
+    self.new( 
+                  :graph_id     => hash['id'],
+                  :author_id    => hash['from']['id'],
+                  :author_name  => hash['from']['name'],
+                  :message      => hash['message'],
+                  :updated_time => Time.parse(hash['updated_time'])
+            )
+  end
+  
+end
+
diff --git a/app/models/person.rb b/app/models/person.rb
index f2209f0ce..28503e921 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -2,8 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-require 'lib/hcard'
+require File.expand_path('../../../lib/hcard', __FILE__)
 
 class Person
   include MongoMapper::Document
@@ -18,7 +17,7 @@ class Person
 
   key :url,            String
   key :diaspora_handle, String, :unique => true
-  key :serialized_key, String
+  key :serialized_public_key, String
 
   key :owner_id,  ObjectId
 
@@ -30,7 +29,7 @@ class Person
 
   before_destroy :remove_all_traces
   before_validation :clean_url
-  validates_presence_of :url, :profile, :serialized_key
+  validates_presence_of :url, :profile, :serialized_public_key
   validates_format_of :url, :with =>
      /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix
 
@@ -50,36 +49,32 @@ class Person
     "#{self.url}receive/users/#{self.id}/"
   end
 
-  def encryption_key
-    OpenSSL::PKey::RSA.new( serialized_key )
+  def public_url
+    "#{self.url}users/#{self.owner.username}/public"
   end
 
-  def encryption_key= new_key
-    raise TypeError unless new_key.class == OpenSSL::PKey::RSA
-    serialized_key = new_key.export
-  end
 
   def public_key_hash
     Base64.encode64 OpenSSL::Digest::SHA256.new(self.exported_key).to_s
   end
 
   def public_key
-    encryption_key.public_key
+    OpenSSL::PKey::RSA.new( serialized_public_key )
   end
 
   def exported_key
-    encryption_key.public_key.export
+    serialized_public_key
   end
 
   def exported_key= new_key
-    raise "Don't change a key" if serialized_key
-    @serialized_key = new_key
+    raise "Don't change a key" if serialized_public_key
+    @serialized_public_key = new_key
   end
 
   def self.by_webfinger( identifier, opts = {})
     #need to check if this is a valid email structure, maybe should do in JS
     local_person = Person.first(:diaspora_handle => identifier.gsub('acct:', '').to_s.downcase)
-    
+
      if local_person
        Rails.logger.info("Do not need to webfinger, found a local person #{local_person.real_name}")
        local_person
@@ -101,9 +96,9 @@ class Person
     new_person = Person.new
 
     public_key_entry = profile.links.select{|x| x.rel == 'diaspora-public-key'}
-    
+
     return nil unless public_key_entry
-    
+
     pubkey = public_key_entry.first.href
     new_person.exported_key = Base64.decode64 pubkey
 
diff --git a/app/models/photo.rb b/app/models/photo.rb
index 8792911f3..15d105739 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -2,7 +2,13 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
+class PhotoAlbumValidator < ActiveModel::Validator
+  def validate(document)
+    unless document.album.person_id == document.person_id
+      document.errors[:base] << "You post photos to that album"
+    end
+  end
+end
 class Photo < Post
   require 'carrierwave/orm/mongomapper'
   include MongoMapper::Document
@@ -22,7 +28,7 @@ class Photo < Post
   timestamps!
 
   validates_presence_of :album
-  validates_true_for :album_id, :logic => lambda {self.validate_album_person}
+  validates_with PhotoAlbumValidator
 
   before_destroy :ensure_user_picture
 
@@ -36,10 +42,6 @@ class Photo < Post
     photo
   end
 
-  def validate_album_person
-    album.person_id == person_id
-  end
-
   def remote_photo
     image.url.nil? ? (remote_photo_path + '/' + remote_photo_name) : image.url
   end
@@ -70,3 +72,4 @@ class Photo < Post
     {:thumb_url => url(:thumb_medium), :id => id, :album_id => album_id}
   end
 end
+
diff --git a/app/models/post.rb b/app/models/post.rb
index e9e135abb..aba822160 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -2,10 +2,9 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Post
-  require 'lib/diaspora/websocket'
-  require 'lib/encryptable'
+  require File.expand_path('../../../lib/encryptable', __FILE__)
+  require File.expand_path('../../../lib/diaspora/websocket', __FILE__)
   include MongoMapper::Document
   include ApplicationHelper
   include ROXML
@@ -14,6 +13,9 @@ class Post
 
   xml_accessor :_id
   xml_accessor :person, :as => Person
+  xml_reader   :public
+
+  key :public   , Boolean, :default => false
 
   key :person_id, ObjectId
   key :user_refs, Integer, :default => 0
@@ -33,7 +35,6 @@ class Post
     self.create params.to_hash
   end
 
-
   def as_json(opts={})
     {
       :post => {
diff --git a/app/models/profile.rb b/app/models/profile.rb
index f03843226..2b8303bd1 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -2,10 +2,9 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Profile
   include MongoMapper::EmbeddedDocument
-  require 'lib/diaspora/webhooks'
+  require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
   include Diaspora::Webhooks
   include ROXML
 
diff --git a/app/models/request.rb b/app/models/request.rb
index 739500e4e..5ba4769a2 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -2,9 +2,8 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Request
-  require 'lib/diaspora/webhooks'
+  require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
   include MongoMapper::Document
   include Diaspora::Webhooks
   include ROXML
diff --git a/app/models/retraction.rb b/app/models/retraction.rb
index 9c1f13f45..20f74bf29 100644
--- a/app/models/retraction.rb
+++ b/app/models/retraction.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Retraction
   include ROXML
   include Diaspora::Webhooks
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index f75536205..c616efc5e 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class StatusMessage < Post
 
   xml_name :status_message
@@ -11,7 +10,6 @@ class StatusMessage < Post
   key :message, String
   validates_presence_of :message
 
-
   def to_activity
         <<-XML
   <entry>
diff --git a/app/models/user.rb b/app/models/user.rb
index 2b74f437b..ca248a8f2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,11 +2,10 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-require 'lib/diaspora/user/friending.rb'
-require 'lib/diaspora/user/querying.rb'
-require 'lib/diaspora/user/receiving.rb'
-require 'lib/salmon/salmon'
+require File.expand_path('../../../lib/diaspora/user/friending', __FILE__)
+require File.expand_path('../../../lib/diaspora/user/querying', __FILE__)
+require File.expand_path('../../../lib/diaspora/user/receiving', __FILE__)
+require File.expand_path('../../../lib/salmon/salmon', __FILE__)
 
 class User
   include MongoMapper::Document
@@ -19,6 +18,7 @@ class User
   devise :database_authenticatable, :registerable,
          :recoverable, :rememberable, :trackable, :validatable
   key :username, :unique => true
+  key :serialized_private_key, String
 
   key :friend_ids,          Array
   key :pending_request_ids, Array
@@ -36,7 +36,7 @@ class User
 
   after_create :seed_aspects
 
-  before_validation_on_create :downcase_username
+  before_validation :downcase_username, :on => :create
 
    def self.find_for_authentication(conditions={})
     if conditions[:username] =~ /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i # email regex
@@ -67,12 +67,11 @@ class User
   def drop_aspect( aspect )
     if aspect.people.size == 0
       aspect.destroy
-    else 
+    else
       raise "Aspect not empty"
     end
   end
 
-
   def move_friend( opts = {})
     return true if opts[:to] == opts[:from]
     friend = Person.first(:_id => opts[:friend_id])
@@ -108,17 +107,10 @@ class User
     intitial_post(class_name, aspect_ids, options)
   end
 
-
-  def intitial_post(class_name, aspect_ids, options = {}) 
+  def intitial_post(class_name, aspect_ids, options = {})
     post = build_post(class_name, options)
     post.socket_to_uid(id, :aspect_ids => aspect_ids) if post.respond_to?(:socket_to_uid)
     push_to_aspects(post, aspect_ids)
-    post 
-  end
-
-  def repost( post, options = {} )
-    aspect_ids = validate_aspect_permissions(options[:to])
-    push_to_aspects(post, aspect_ids)
     post
   end
 
@@ -129,16 +121,20 @@ class User
   end
 
   def validate_aspect_permissions(aspect_ids)
-    aspect_ids = [aspect_ids.to_s] if aspect_ids.is_a? BSON::ObjectId
+    if aspect_ids == "all"
+      return aspect_ids
+    end
+
+    aspect_ids = [aspect_ids.to_s] unless aspect_ids.is_a? Array
 
     if aspect_ids.nil? || aspect_ids.empty?
       raise ArgumentError.new("You must post to someone.")
     end
 
     aspect_ids.each do |aspect_id|
-      unless aspect_id == "all" || self.aspects.find(aspect_id) 
+      unless self.aspects.find(aspect_id)
         raise ArgumentError.new("Cannot post to an aspect you do not own.")
-      end 
+      end
     end
 
     aspect_ids
@@ -250,7 +246,9 @@ class User
   def self.instantiate!( opts = {} )
     opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
     opts[:person][:url] = APP_CONFIG[:pod_url]
-    opts[:person][:serialized_key] = generate_key
+    
+    opts[:serialized_private_key] = generate_key
+    opts[:person][:serialized_public_key] = opts[:serialized_private_key].public_key
     User.create(opts)
   end
 
@@ -258,7 +256,6 @@ class User
     aspect(:name => "Family")
     aspect(:name => "Work")
   end
-  
 
   def diaspora_handle
     "#{self.username}@#{APP_CONFIG[:terse_pod_url]}"
@@ -268,7 +265,6 @@ class User
     username.downcase! if username
   end
 
-
   def as_json(opts={})
     {
       :user => {
@@ -279,7 +275,14 @@ class User
       }
     }
   end
-    def self.generate_key
-      OpenSSL::PKey::RSA::generate 4096
-    end
+
+
+  def self.generate_key
+    OpenSSL::PKey::RSA::generate 4096
+  end
+  
+  def encryption_key
+    OpenSSL::PKey::RSA.new( serialized_private_key )
+  end
+
 end
diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb
index 6e5312341..58399c90d 100644
--- a/app/uploaders/image_uploader.rb
+++ b/app/uploaders/image_uploader.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class ImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
 
diff --git a/app/views/albums/_album.html.haml b/app/views/albums/_album.html.haml
index a2d2eb46b..4f41e5cfb 100644
--- a/app/views/albums/_album.html.haml
+++ b/app/views/albums/_album.html.haml
@@ -15,4 +15,4 @@
   %div.image_cycle
     - for photo in post.photos[0..3]
       = link_to (image_tag photo.url(:thumb_large)), album_path(post, :aspect => @aspect)
-    
+
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index daefe15f3..e0212a6b4 100644
--- a/app/views/albums/_new_album.haml
+++ b/app/views/albums/_new_album.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1=t('.add_a_new_album')
 
 = form_for Album.new do |f|
diff --git a/app/views/albums/edit.html.haml b/app/views/albums/edit.html.haml
index 4dfb2294c..67cc3071d 100644
--- a/app/views/albums/edit.html.haml
+++ b/app/views/albums/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 .back= link_to "⇧ #{@album.name}", @album
 %h1.big_text
 
diff --git a/app/views/albums/index.html.haml b/app/views/albums/index.html.haml
index af83b53eb..2e680c110 100644
--- a/app/views/albums/index.html.haml
+++ b/app/views/albums/index.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   :javascript
     $(document).ready(function(){
diff --git a/app/views/albums/show.html.haml b/app/views/albums/show.html.haml
index 7b5e6c8be..4c9ba19b8 100644
--- a/app/views/albums/show.html.haml
+++ b/app/views/albums/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $(document).ready(function(){
     $(".image_thumb img").load( function() {
@@ -25,8 +24,6 @@
     = @album.name
   ="#{t('.updated')} #{how_long_ago(@album)}"
 
-
-
 .album_id{:id => @album.id, :style => "display:hidden;"}
 
 -unless current_user.owns? @album
diff --git a/app/views/aspects/_new_aspect.haml b/app/views/aspects/_new_aspect.haml
index 9f0b662dd..548abd0d1 100644
--- a/app/views/aspects/_new_aspect.haml
+++ b/app/views/aspects/_new_aspect.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1=t('.add_a_new_aspect')
 = form_for Aspect.new do |f|
   = f.error_messages
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 47a68ffeb..ae24e8e3b 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -2,10 +2,8 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   = link_to t('.photos'), albums_path(:aspect => @aspect)
-  
 
 - content_for :left_pane do
   = render "shared/aspect_friends"
diff --git a/app/views/aspects/manage.html.haml b/app/views/aspects/manage.html.haml
index af64fcc23..e08f6dabd 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -2,8 +2,7 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-- content_for :head do 
+- content_for :head do
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
 
@@ -29,12 +28,10 @@
 - content_for :publish do
   = link_to(t('.add_a_new_aspect'), "#add_aspect_pane", :id => "add_aspect_button", :class => "new_aspect button", :title => t('.add_a_new_aspect'))
 
-
-
 %ul#aspect_list
   - for aspect in @aspects
     %li.aspect
-      
+
       .aspect_name
         %span.edit_name_field
           %h1{:contenteditable => true}= aspect.name
@@ -44,9 +41,9 @@
           %li= link_to t('.add_a_new_friend'), "#add_request_pane_#{aspect.id}", :class => 'add_request_button'
           %li= link_to t('.show'), aspect_path(aspect)
           %li!= remove_link(aspect)
-      
+
       %ul.dropzone{:id => aspect.id}
-      
+
         -if aspect.people.size < 1
           %li.grey Drag to add people
 
diff --git a/app/views/aspects/public.html.haml b/app/views/aspects/public.html.haml
new file mode 100644
index 000000000..f04b63489
--- /dev/null
+++ b/app/views/aspects/public.html.haml
@@ -0,0 +1,24 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3.  See
+-#   the COPYRIGHT file.
+
+
+- content_for :page_title do
+  = link_to "photos", albums_path(:aspect => @aspect)
+
+- content_for :left_pane do
+  = render "shared/aspect_friends"
+
+- content_for :publish do
+  - if @logged_in
+    = render "shared/publisher", :aspect_ids => :public
+  - else 
+    = render "shared/publisher", :aspect_ids => :all
+
+%ul#stream
+  - for post in @posts
+    = render type_partial(post), :post => post unless post.class == Album
+
+#pagination
+  = will_paginate @posts
+
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index d4262f838..ae24e8e3b 100644
--- a/app/views/aspects/show.html.haml
+++ b/app/views/aspects/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   = link_to t('.photos'), albums_path(:aspect => @aspect)
 
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 4fd46eb56..03a2fcf61 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -2,8 +2,7 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-%li.comment{:id => post.id} 
+%li.comment{:id => post.id}
   = person_image_tag(post.person)
   %span.from
     = link_to post.person.real_name, post.person
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index fc5c64da7..aecfb4bf1 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -2,11 +2,10 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %div.comments
   %ul.comment_set{:id => post.id}
     - for comment in post.comments
       = render 'comments/comment', :post => comment
     %li.comment.show
       = render 'comments/new_comment', :post => post
-	 	
+
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index a4268082d..99c03f898 100644
--- a/app/views/comments/_new_comment.html.haml
+++ b/app/views/comments/_new_comment.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for Comment.new, :remote => true do |f|
   %p
     %label{:for => "comment_text_on_#{post.id}"} Comment
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.html.haml
index a2de719b5..5803415b4 100644
--- a/app/views/devise/sessions/new.html.haml
+++ b/app/views/devise/sessions/new.html.haml
@@ -1,7 +1,7 @@
 %h1
   This is a technology preview, do not provide any private information.
-%h3 
-  your account may be deleted until we move into a more stable development period. 
+%h3
+  your account may be deleted until we move into a more stable development period.
 %h3
   USE AT YOUR OWN RISK!!
 = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
diff --git a/app/views/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 33af68cce..4677f6ce6 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = javascript_include_tag 'FABridge', 'swfobject', 'web_socket'
 :javascript
   WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf";
@@ -19,25 +18,23 @@
 
       if (obj['class']=="retractions"){
         processRetraction(obj['post_id']);
-      
+
       }else if (obj['class']=="comments"){
-        processComment(obj['post_id'], obj['html']) 
-      
+        processComment(obj['post_id'], obj['html'])
+
       }else if (obj['class']=='photos' && onPageForClass('albums')){
         processPhotoInAlbum(obj['photo_hash'])
       }else{
         processPost(obj['class'], obj['html'], obj['aspect_ids'])
       }
 
-      
-    }; 
+    };
     ws.onclose = function() { debug("socket closed"); };
     ws.onopen = function() {
       ws.send(location.pathname);
       debug("connected...");
     };
 
-
   });
   function processRetraction(post_id){
     $('#' + post_id ).fadeOut(500, function(){
@@ -66,7 +63,7 @@
         $(html).fadeIn("fast", function(){
           $("#stream label:first").inFieldLabels();
         })
-      ); 
+      );
     }
   }
 
@@ -77,13 +74,13 @@
     html =  "<div class=\'image_thumb\' id=\'"+photoHash['id']+"\' style=\'padding-right:3px;\'> \
       <a href=\"/photos/"+ photoHash['id'] +"\"> \
       <img alt=\"New thumbnail\" src=\""+ photoHash['thumb_url'] +"\" /> \
-      </a> </div>"  
+      </a> </div>"
     $("#thumbnails").append( $(html) )
     $("#"+ photoHash['id'] + "  img").load( function() {
       $(this).fadeIn("slow");
     });
   }
-  
+
   function onPageForClass(className){
     return (location.href.indexOf(className) != -1 );
   }
@@ -100,9 +97,9 @@
   }
 
   function onPageForAspect(aspectId){
-    return (location.href.indexOf(aspectId) != -1 ) 
+    return (location.href.indexOf(aspectId) != -1 )
   }
-  
+
   function onPageOne() {
       var c = document.location.search.charAt(document.location.search.length-1);
       return ((c =='') || (c== '1'));
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 7a48d7ed7..fc063e0b6 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head
@@ -10,24 +9,24 @@
       = "#{current_user.real_name} | diaspora" if current_user
 
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
-    
+
     = stylesheet_link_tag "blueprint/screen", :media => 'screen'
     = stylesheet_link_tag "application", "ui"
 
-    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1" 
-    = stylesheet_link_tag "fileuploader" 
+    = stylesheet_link_tag "/../javascripts/fancybox/jquery.fancybox-1.3.1"
+    = stylesheet_link_tag "fileuploader"
 
     /= javascript_include_tag "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery-1.4.2.min', 'rails'
     = javascript_include_tag 'jquery.infieldlabel', 'jquery.cycle/jquery.cycle.min.js'
-    
+
     = javascript_include_tag 'fancybox/jquery.fancybox-1.3.1.pack'
     = javascript_include_tag 'fileuploader'
 
     = javascript_include_tag 'view', 'image_picker', 'stream'
 
     = render 'js/websocket_js'
-    
+
     = csrf_meta_tag
     = yield(:head)
 
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 351daee0e..29b863b32 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 !!!
 %html
   %head
@@ -10,7 +9,7 @@
       DIASPORA | login
     %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/
     %meta{"http-equiv"=> "X-UA-Compatible", :content =>"chrome=1" }
-    
+
     = stylesheet_link_tag "sessions"
     /= javascript_include_tag"http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"
     = javascript_include_tag 'jquery142'
@@ -18,10 +17,10 @@
 
     :javascript
       $(document).ready(function(){
-        $("#user_username").focus(); 
+        $("#user_username").focus();
         $("label").inFieldLabels();
       });
-  
+
     = csrf_meta_tag
     = yield(:head)
 
@@ -44,11 +43,11 @@
         </div>
       </div>
       <![endif]-->
-  
+
     - flash.each do |name, msg|
       = content_tag :div, msg, :id => "flash_#{name}"
     %div#huge_text
       DIASPORA*
     = yield
-    
+
     /= link_to "signup", "/signup"
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index 2cd1dc4a7..5981569b8 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :publish do
   %h1
     Search
@@ -21,5 +20,5 @@
 %ul#stream
   - for person in @people
     = render 'people/person', :person => person
-    
+
 = will_paginate @people
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index 25821ed37..0584732bc 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - title=t('.new_person')
 
 = form_for @person do |f|
@@ -15,18 +14,17 @@
     = f.label :url
     %br
     = f.text_field :url
-    
+
     =f.fields_for :profile do |p|
       %p
         = p.label :first_name
         %br
         = p.text_field :first_name
-        
+
       %p
         = p.label :last_name
         %br
         = p.text_field :last_name
     = f.submit
 
-
 %p= link_to t('.back_to_list'), people_path
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 23e6ea64d..9b5128160 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :page_title do
   profile
 
@@ -28,7 +27,7 @@
       = link_to t('.remove_friend'), @person, :confirm => t('.are_you_sure'), :method => :delete, :class => "button"
 
 .span-20.last
-  
+
   .span-19.last
     - if @posts
       %ul#stream
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index abb8cf528..d1a4fc73f 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -2,16 +2,15 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
-  function createUploader(){            
+  function createUploader(){
     var uploader = new qq.FileUploader({
         element: document.getElementById('file-upload'),
         params: {'album_id' : "#{@album.id}"},
         allowedExtensions: ['jpg', 'jpeg', 'png', 'gif'],
         action: "#{photos_path}"
-    });           
+    });
   }
-  window.onload = createUploader;      
+  window.onload = createUploader;
 
 #file-upload
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index ae8829c61..5e86e32a6 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id}
 
   = person_image_tag(post.person)
@@ -17,9 +16,19 @@
       %br
       = render "albums/album", :post => post.album, :current_user => current_user
       = link_to (image_tag post.url(:thumb_medium)), object_path(post)
-      
+
     .info
       = link_to(how_long_ago(post), photo_path(post))
       \--
       = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
-    = render   "comments/comments", :post => post 
+    = render   "comments/comments", :post => post
+
+  - if post.public?
+    .public_aspect_tag
+      public
+  - else
+    .aspect_tag
+      %ul
+        - for aspect in current_user.aspects_with_post( post.id )
+          %li= aspect.name
+
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index 1f36ae99f..06556039c 100644
--- a/app/views/photos/edit.html.haml
+++ b/app/views/photos/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1.big_text
   .back
     = link_to "⇧ #{@album.name}", album_path(@album)
@@ -14,6 +13,7 @@
     = linked_scaled_photo @photo, @album
 
   = form_for @photo do |p|
+    = p.label :caption
     = p.text_field :caption, :value => @photo.caption
     = p.submit
 
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index 1fdf71a84..d8701c265 100644
--- a/app/views/photos/new.html.haml
+++ b/app/views/photos/new.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - title t('.new_photo')
 
 = form_for( @photo, :html => {:multipart => true}) do |f|
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 21ce72181..787f5861d 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   $(document).keydown(function(e){
     switch(e.keyCode) {
@@ -35,7 +34,6 @@
     -if current_user.owns? @album
       = link_to t('.edit_photo'), edit_photo_path(@photo), :class => "button"
 
-
 %div{:id => @photo.id}
   #show_photo
     = linked_scaled_photo @photo, @album
@@ -53,4 +51,4 @@
   %h4{:class => "show_post_comments"}
     = "#{t('.comments')} (#{@photo.comments.count})"
   = render "comments/comments", :post => @photo
-    
+
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index 17d7baad8..ef1984d7d 100644
--- a/app/views/posts/_debug.haml
+++ b/app/views/posts/_debug.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #debug_info
   %h5 DEBUG INFO
   #debug_more{ :style => "display:none;" }
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index 217441465..acad2e12b 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -2,8 +2,7 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %ul
-  %h3= link_to post.class, object_path(post) 
+  %h3= link_to post.class, object_path(post)
   - for field in object_fields(post)
-    %li= "#{field}: #{post.attributes[field]}" 
+    %li= "#{field}: #{post.attributes[field]}"
diff --git a/app/views/publics/hcard.erb b/app/views/publics/hcard.erb
index f8a3fef91..9e3f27796 100644
--- a/app/views/publics/hcard.erb
+++ b/app/views/publics/hcard.erb
@@ -1,42 +1,42 @@
-<div id="content"> 
-  <h1><%=@person.real_name%></h1> 
-  <div id="content_inner"> 
-    <div id="i" class="entity_profile vcard author"> 
-      <h2>User profile</h2> 
-      <dl class="entity_nickname"> 
-        <dt>Nickname</dt> 
-        <dd> 
-        <a href="<%=@person.url%>" rel="me" class="nickname url uid"><%= @person.real_name%></a> 
-        </dd> 
-      </dl> 
-        <dl class="entity_given_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="given_name" ><%= @person.profile.first_name %></span> 
-        </dd> 
+<div id="content">
+  <h1><%=@person.real_name%></h1>
+  <div id="content_inner">
+    <div id="i" class="entity_profile vcard author">
+      <h2>User profile</h2>
+      <dl class="entity_nickname">
+        <dt>Nickname</dt>
+        <dd>
+        <a href="<%=@person.url%>" rel="me" class="nickname url uid"><%= @person.real_name%></a>
+        </dd>
+      </dl>
+        <dl class="entity_given_name">
+        <dt>Full name</dt>
+        <dd>
+        <span class="given_name" ><%= @person.profile.first_name %></span>
+        </dd>
         </dl>
-        <dl class="entity_family_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="family_name" ><%= @person.profile.last_name %></span> 
-        </dd> 
+        <dl class="entity_family_name">
+        <dt>Full name</dt>
+        <dd>
+        <span class="family_name" ><%= @person.profile.last_name %></span>
+        </dd>
         </dl>
-        <dl class="entity_fn"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="fn" ><%= @person.real_name %></span> 
-        </dd> 
-      </dl> 
-      <dl class="entity_url"> 
-        <dt>URL</dt> 
-        <dd> 
-        <a href="<%= @person.url%>" rel="me" id="pod_location" class="url"><%= @person.url%></a> 
-        </dd> 
-      </dl> 
-      <dl class="entity_note"> 
-        <dt>Note</dt> 
-        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd> 
-      </dl> 
-    </div> 
-  </div> 
-</div> 
+        <dl class="entity_fn">
+        <dt>Full name</dt>
+        <dd>
+        <span class="fn" ><%= @person.real_name %></span>
+        </dd>
+      </dl>
+      <dl class="entity_url">
+        <dt>URL</dt>
+        <dd>
+        <a href="<%= @person.url%>" rel="me" id="pod_location" class="url"><%= @person.url%></a>
+        </dd>
+      </dl>
+      <dl class="entity_note">
+        <dt>Note</dt>
+        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
+      </dl>
+    </div>
+  </div>
+</div>
diff --git a/app/views/publics/host_meta.erb b/app/views/publics/host_meta.erb
index e28fb6211..ff24552b9 100644
--- a/app/views/publics/host_meta.erb
+++ b/app/views/publics/host_meta.erb
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' 
+<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'
      xmlns:hm='http://host-meta.net/xrd/1.0'>
      <hm:Host><%= terse_url(root_url) %></hm:Host>
-  <Link rel='lrdd' 
+  <Link rel='lrdd'
         template='<%= root_url %>webfinger?q={uri}'>
     <Title>Resource Descriptor</Title>
   </Link>
diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index f837c92de..25902720e 100644
--- a/app/views/registrations/new.html.haml
+++ b/app/views/registrations/new.html.haml
@@ -1,6 +1,5 @@
 = image_tag "http://needcoffee.cachefly.net/needcoffee/uploads/2009/02/predator-arnold-schwarzenegger.jpg"
 
-
 = form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
   %p
     = f.label :username
diff --git a/app/views/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 70c204e7c..0dbf5b0a1 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1
   =t('.add_a_new_friend_to')
   %i= aspect.name
@@ -10,7 +9,7 @@
 = form_for Request.new do |f|
   = f.error_messages
 
-  =t('.enter_a_diaspora_username')  
+  =t('.enter_a_diaspora_username')
   %br
   %i= t '.your_diaspora_username_is', :diaspora_handle  => current_user.diaspora_handle
 
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index 5e1dfe213..f8e635f8d 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -2,19 +2,22 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #friend_pictures
   = owner_image_link
   - for friend in @friends
     = person_image_link(friend)
-
-  -unless @aspect == :all
+    - if @logged_in && (@aspect == :public)
+      %h3 Facebook Friends
+      - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")                                                                                            
+      - @fb_friends[:data].each do |friend|            
+        = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
+  -unless (@aspect == :all) || (@aspect == :public)
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'
-  
+
     .yo{:style => 'display:none'}
       #add_request_pane
-        = render "requests/new_request", :aspect => @aspect 
+        = render "requests/new_request", :aspect => @aspect
   -else
     .clear
-      = link_to t('.add_friends'), aspects_manage_path 
+      = link_to t('.add_friends'), aspects_manage_path
 
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 8e900e42d..dc01afd20 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -2,16 +2,17 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #aspect_nav
   %ul
+    %li{:class => ("selected" if @aspect == :all)}
+      = link_to t('.all_aspects'), root_url
     - for aspect in @aspects
       %li{:class => ("selected" if current_aspect?(aspect))}
         = link_for_aspect aspect
 
   %ul{ :style => "position:absolute;right:0;bottom:0.01em;"}
-    %li{:class => ("selected" if @aspect == :all)}
-      = link_to t('.all_aspects'), root_url
+    %li{:class => ("selected" if @aspect == :public)}
+      = link_to "Public", aspects_public_path
 
     %li{ :style => "margin-right:0;", :class => ("selected" if @aspect == :manage)}
       = link_to ( (@request_count == 0)? t('.manage') : "#{t('.manage')} (#{@request_count})"), {:controller => :aspects, :action => :manage}, :class => "edit_aspect_button", :class => new_request(@request_count), :title => t('.manage_your_aspects')
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index b901fc608..956706b68 100644
--- a/app/views/shared/_post_wrapper.haml
+++ b/app/views/shared/_post_wrapper.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
   = person_image_link(post.person)
   = yield post_yield_tag(post)
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 040d3e3c2..d1ad995df 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #publisher
   = owner_image_tag
 
@@ -11,12 +10,13 @@
     %p
       %label{:for => "status_message_message"} Message
       = f.text_area :message, :rows => 2, :value => params[:prefill]
+      = connected_fb_as(@access_token) if @logged_in && @aspect == :public
+      = f.hidden_field( :public, :value => (params[:action] == 'public') )
 
     %ul.aspect_selector{ :style => "display:none;"}
       going to...
       - for aspect in @aspects
         %li
-          = check_box_tag("aspect_ids[]", aspect.id, @aspect == :all || current_aspect?(aspect) )
+          = check_box_tag("aspect_ids[]", aspect.id, @aspect == :public || @aspect == :all || current_aspect?(aspect) )
           = aspect.name
-      
     = f.submit t('.share')
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
index 0b4120d52..9df1c9ce1 100644
--- a/app/views/shared/_reshare.haml
+++ b/app/views/shared/_reshare.haml
@@ -2,8 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
-
 :javascript
   $(".reshare_button").toggle(function(e){
     e.preventDefault();
@@ -19,7 +17,7 @@
 
   %ul.reshare_box
     - for aspect in current_user.aspects_with_post( post.id )
-    
+
       %li.currently_sharing= aspect.name
 
     - for aspect in current_user.aspects
diff --git a/app/views/shared/_sub_header.haml b/app/views/shared/_sub_header.haml
index d8ad6c603..227b63d4e 100644
--- a/app/views/shared/_sub_header.haml
+++ b/app/views/shared/_sub_header.haml
@@ -8,6 +8,8 @@
         %h1
           - if @aspect == :all
             = link_to t('.all_aspects'), root_path
+          - elsif @aspect == :public
+            = "Public"
           - elsif @aspect == :manage
             = link_to t('.manage_aspects'), root_path
           - else
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index 7472689e3..bf957bf7c 100644
--- a/app/views/shared/log.haml
+++ b/app/views/shared/log.haml
@@ -2,5 +2,4 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = @log.to_s
diff --git a/app/views/status_messages/_new_status_message.haml b/app/views/status_messages/_new_status_message.haml
index b515dadff..c27585f0a 100644
--- a/app/views/status_messages/_new_status_message.haml
+++ b/app/views/status_messages/_new_status_message.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 = form_for StatusMessage.new, :remote => true do |f|
   = f.error_messages
   %p
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 4d73f4251..d1568c7bb 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -2,24 +2,33 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.message{:id => post.id, :class => ("mine" if current_user.owns?(post))}
 
   = person_image_link(post.person)
 
   .content
     %span.from
-      = link_to post.person.real_name, post.person 
+      = link_to post.person.real_name, post.person
       = post.message
-      
+
     .info
       %span.time= link_to(how_long_ago(post), object_path(post))
       \--
       = link_to "#{t('.show_comments')} (#{post.comments.count})", '#', :class => "show_post_comments"
 
-    = render "comments/comments", :post => post 
+    = render "comments/comments", :post => post
 
   - if current_user.owns?(post)
     .destroy_link
       = link_to t('.delete'), status_message_path(post), :confirm => t('.are_you_sure'), :method => :delete, :remote => true, :class => "delete"
-      = render "shared/reshare", :post => post, :current_user => current_user 
+      = render "shared/reshare", :post => post, :current_user => current_user
+
+  - if post.public?
+    .public_aspect_tag
+      public
+  - else
+    .aspect_tag
+      %ul
+        - for aspect in current_user.aspects_with_post( post.id )
+          %li= aspect.name
+
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index c2a579d87..43c065380 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -2,11 +2,10 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %h1.big_text status messages
 = render "status_messages/new_status_message", :status_message => @status_message
 %ul#stream
-  
+
   - for status_message in @status_messages
     = render "status_message", :post => status_message
 #pagination
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index ae4ece073..3d78dd29e 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -7,6 +7,7 @@
   = @status_message.message
 
 %h4= "#{t('.comments')} (#{@status_message.comments.count})"
+
 = render "comments/comments", :post => @status_message
 
 %p
diff --git a/app/views/users/_profile.haml b/app/views/users/_profile.haml
new file mode 100644
index 000000000..2b26eead0
--- /dev/null
+++ b/app/views/users/_profile.haml
@@ -0,0 +1,59 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3.  See
+-#   the COPYRIGHT file.
+
+
+%h2 Profile
+
+= form_for @user do |f|
+  = f.error_messages
+
+  = f.fields_for :profile do |p|
+
+    %h3="#{t('.picture')}"
+    %div#image_picker
+      = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
+
+      - unless @photos.nil? || @photos.empty?
+        - for photo in @photos
+          - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
+            %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
+              = check_box_tag 'checked_photo', true, true
+              = link_to image_tag(photo.url(:thumb_medium)), "#"
+          - else
+            %div.small_photo{:id => photo.url(:thumb_medium)}
+              = check_box_tag 'checked_photo'
+              = link_to image_tag(photo.url(:thumb_medium)), "#"
+
+      - else
+        =t('.you_dont_have_any_photos')
+        = link_to t('.albums'), albums_path(:aspect => 'all')
+        =t('.page_to_upload_some')
+
+    =will_paginate @photos
+
+    %br
+
+    %h3="#{t('.info')}"
+
+    %p
+      %b
+        ="#{t('.diaspora_username')}:"
+        = @user.diaspora_handle
+
+    %p
+      = p.label :first_name
+      = p.text_field :first_name, :value => @profile.first_name
+    %p
+      = p.label :last_name
+      = p.text_field :last_name, :value => @profile.last_name
+
+  #submit_block
+    = link_to t('.cancel'), root_path
+    or
+    = f.submit t('.update_profile')
+
+#content_bottom
+  .back
+    = link_to "⇧ #{t('.home')}", root_path
+
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
new file mode 100644
index 000000000..f2d976a79
--- /dev/null
+++ b/app/views/users/_services.haml
@@ -0,0 +1,24 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3.  See
+-#   the COPYRIGHT file.
+
+
+%h2 Services
+
+%h3 Facebook
+%p
+  - if @logged_in
+    = connected_fb_as(@access_token)
+    
+    %p
+    - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
+    - @fb_friends[:data].each do |friend|
+      = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
+
+    = link_to "Disconnect from Facebook", services_destroy_path
+  - else
+    = link_to "Connect to Facebook (DO NOT USE WITH A REAL ACCOUNT)", @fb_access_url
+
+  #content_bottom
+    .back
+      = link_to "⇧ home", root_path
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 25668776f..a3f090027 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -2,61 +2,29 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
+:javascript
+  $("#settings_nav li > a").click( function() {
+    var target = "#"+$(this).attr('class');
+    if( !$(target).is(":visible") ) {
+      $(".settings_pane").fadeOut(200, function() {
+        $(target).delay(200).fadeIn(200);
+      });
+    }
+  });
+
 
 - content_for :publish do
   %h1="#{t('.editing_profile')}"
 
 - content_for :left_pane do
-  \.
+  %ul#settings_nav
+    %li=link_to 'Profile', '#', :class => 'profile'
+    %li=link_to 'Services', '#', :class => 'services'
 
-= form_for @user do |f|
-  = f.error_messages
+#profile.settings_pane{:style=>"display:block;"}
+  = render 'users/profile'
 
-  = f.fields_for :profile do |p|
+#services.settings_pane
+  = render 'users/services'
+    
 
-    %h3="#{t('.picture')}"
-    %div#image_picker
-      = p.hidden_field :image_url, :value => (@profile.image_url if @profile.image_url), :id => 'image_url_field'
-
-      - unless @photos.nil? || @photos.empty?
-        - for photo in @photos
-          - if @profile.image_url && @profile.image_url.include?(photo.url(:thumb_medium))
-            %div.small_photo{:id => photo.url(:thumb_medium), :class=>'selected'}
-              = check_box_tag 'checked_photo', true, true
-              = link_to image_tag(photo.url(:thumb_medium)), "#"
-          - else
-            %div.small_photo{:id => photo.url(:thumb_medium)}
-              = check_box_tag 'checked_photo'
-              = link_to image_tag(photo.url(:thumb_medium)), "#"
-
-      - else
-        =t('.you_dont_have_any_photos')
-        = link_to t('.albums'), albums_path(:aspect => 'all')
-        =t('.page_to_upload_some')
-
-    =will_paginate @photos
-
-    %br
-
-    %h3="#{t('.info')}"
-
-    %p
-      %b
-        ="#{t('.diaspora_username')}:"
-        = @user.diaspora_handle
-
-    %p
-      = p.label :first_name
-      = p.text_field :first_name, :value => @profile.first_name
-    %p
-      = p.label :last_name 
-      = p.text_field :last_name, :value => @profile.last_name
-
-  #submit_block
-    = link_to t('.cancel'), root_path
-    or
-    = f.submit t('.update_profile')
-
-#content_bottom
-  .back
-    = link_to "⇧ #{t('.home')}", root_path
diff --git a/autotest/discover.rb b/autotest/discover.rb
index 99ab1f6e4..76b9d2044 100644
--- a/autotest/discover.rb
+++ b/autotest/discover.rb
@@ -2,6 +2,5 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Autotest.add_discovery { "rails" }
 Autotest.add_discovery { "rspec2" }
diff --git a/config.ru b/config.ru
index cb12bcfa2..0c65f5908 100644
--- a/config.ru
+++ b/config.ru
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)
diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index 75568dd11..069823a05 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 default:
   pod_url: "http://example.org/"
   debug: false
@@ -13,7 +12,7 @@ default:
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
   mongo_host: 'localhost'
   mongo_port: 27017
-  
+
 development:
 
 test:
diff --git a/config/application.rb b/config/application.rb
index bf3b5699a..59b82e216 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require File.expand_path('../boot', __FILE__)
 
 require 'action_controller/railtie'
@@ -13,7 +11,7 @@ require 'active_resource/railtie'
 # you've limited to :test, :development, or :production.
 Bundler.require(:default, Rails.env) if defined?(Bundler)
 
-require 'lib/mongo_mapper/bson_id'
+require File.expand_path('../../lib/mongo_mapper/bson_id', __FILE__)
 module Diaspora
   class Application < Rails::Application
     # Settings in config/environments/* take precedence over those specified here.
diff --git a/config/boot.rb b/config/boot.rb
index faeac6742..0d0c42268 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
diff --git a/config/cucumber.yml b/config/cucumber.yml
new file mode 100644
index 000000000..621a14cea
--- /dev/null
+++ b/config/cucumber.yml
@@ -0,0 +1,8 @@
+<%
+rerun = File.file?('rerun.txt') ? IO.read('rerun.txt') : ""
+rerun_opts = rerun.to_s.strip.empty? ? "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} features" : "--format #{ENV['CUCUMBER_FORMAT'] || 'pretty'} #{rerun}"
+std_opts = "--format #{ENV['CUCUMBER_FORMAT'] || 'progress'} --strict --tags ~@wip"
+%>
+default: <%= std_opts %> features
+wip: --tags @wip:3 --wip features
+rerun: <%= rerun_opts %> --format rerun --out rerun.txt --strict --tags ~@wip
diff --git a/config/deploy.rb b/config/deploy.rb
index 2f8065134..98d8971f7 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 config = YAML.load_file(File.dirname(__FILE__) + '/deploy_config.yml')
 all = config['cross_server']
 
@@ -108,7 +106,6 @@ namespace :deploy do
     run 'gem install bundler'
   end
 
-
   task :migrate do
   end
  end
@@ -150,9 +147,9 @@ namespace :db do
     purge
     backer_seed
     tom_seed
+    deploy::restart
   end
 
-
 end
 
 after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle", 'deploy:symlink_config'
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 9bd7a6b96..6aacbf3ff 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
diff --git a/config/environment.rb b/config/environment.rb
index 385a96651..6b960209f 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,13 +2,18 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 Haml::Template.options[:format] = :html5
 Haml::Template.options[:escape_html] = true
+
+# Load facebook connection application credentials
+fb_config  = YAML::load(File.open(File.expand_path("./config/fb_config.yml")))
+FB_API_KEY = fb_config['fb_api_key']
+FB_SECRET  = fb_config['fb_secret']
+FB_APP_ID  = fb_config['fb_app_id']
+HOST       = fb_config['host']
+
 # Initialize the rails application
 Diaspora::Application.initialize!
 
-
diff --git a/config/environments/development.rb b/config/environments/development.rb
index e73a3e9d1..15d1fc2bb 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -2,8 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-require 'lib/mongo_mapper/clear_dev_memory'
+require File.expand_path('../../../lib/mongo_mapper/clear_dev_memory', __FILE__)
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3207c627d..cb13c1d1c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -16,7 +15,7 @@ Diaspora::Application.configure do
 
   # Specifies the header that your server uses for sending files
   #config.action_dispatch.x_sendfile_header = "X-Sendfile"
-  
+
   config.active_support.deprecation = :notify
 
   # For nginx:
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4e17d81e8..46b44db55 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Diaspora::Application.configure do
   # Settings specified here will take precedence over those in config/environment.rb
 
@@ -32,13 +31,11 @@ Diaspora::Application.configure do
   config.active_support.deprecation = :stderr
   config.threadsafe!
 
-
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,
   # like if you have constraints or database-specific column types
   # config.active_record.schema_format = :sql
 
-
 begin
  require 'database_cleaner'
  DatabaseCleaner.strategy = :truncation
diff --git a/config/fb_config.yml b/config/fb_config.yml
new file mode 100644
index 000000000..4c3309fac
--- /dev/null
+++ b/config/fb_config.yml
@@ -0,0 +1,4 @@
+fb_api_key: {dcf4e90df086cf6d3e531b31e043ff32}
+fb_secret: {7fe864834726f8a5e65bc93928b99a53}
+fb_app_id: {120373411325347}
+host: http://localhost:3000/
diff --git a/config/initializers/_load_app_config.rb b/config/initializers/_load_app_config.rb
index e739941e9..22bf14ead 100644
--- a/config/initializers/_load_app_config.rb
+++ b/config/initializers/_load_app_config.rb
@@ -20,7 +20,7 @@ else
   APP_CONFIG = all_envs['default'].symbolize_keys
 end
 
-APP_CONFIG[:terse_pod_url] = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '') 
+APP_CONFIG[:terse_pod_url] = APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '')
 APP_CONFIG[:terse_pod_url].chop! if APP_CONFIG[:terse_pod_url][-1, 1] == '/'
 
 puts "WARNING: Please modify your app_config.yml to have a proper pod_url!" if APP_CONFIG[:terse_pod_url] == "example.org" && Rails.env != :test
diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb
index d456f8c8b..1efed86e9 100644
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 6dea937e9..b28f1be66 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 CarrierWave.configure do |config|
   config.storage = :file
 end
diff --git a/config/initializers/check_session_secret.rb b/config/initializers/check_session_secret.rb
new file mode 100644
index 000000000..1970c5078
--- /dev/null
+++ b/config/initializers/check_session_secret.rb
@@ -0,0 +1,5 @@
+unless File.exists?( File.join(Rails.root, 'config', 'initializers', 'secret_token.rb'))
+  `rake generate:secret_token`
+   require  File.join(Rails.root, 'config', 'initializers', 'secret_token.rb')
+end
+
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 9f483a8bf..a02045546 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Use this hook to configure devise mailer, warden hooks and so forth. The first
 # four configuration values can also be set straight in your models.
 Devise.setup do |config|
diff --git a/config/initializers/git_info.rb b/config/initializers/git_info.rb
index a6d767aa4..82fc99143 100644
--- a/config/initializers/git_info.rb
+++ b/config/initializers/git_info.rb
@@ -2,5 +2,4 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-GIT_INFO = `git show`
+GIT_INFO = `git show --name-only`
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 3171994ee..0e4097c04 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index dd607a273..823179842 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
 I18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
-I18n.default_locale = :en
\ No newline at end of file
+I18n.default_locale = :en
diff --git a/config/initializers/logging.rb b/config/initializers/logging.rb
index 86abdbea3..48cc2fa30 100644
--- a/config/initializers/logging.rb
+++ b/config/initializers/logging.rb
@@ -2,6 +2,5 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Rails.logger = Logger.new(
   Rails.root.join("log",Rails.env + ".log"),3,5*1024*1024)
diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb
index a5a89433a..77424db27 100644
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:
diff --git a/config/initializers/rspec_generator.rb b/config/initializers/rspec_generator.rb
index caf2be23a..bdec44a03 100644
--- a/config/initializers/rspec_generator.rb
+++ b/config/initializers/rspec_generator.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 Diaspora::Application.configure do
   config.generators do |g|
     g.integration_tool :rspec
diff --git a/config/initializers/secret_token.rb b/config/initializers/secret_token.rb
index c61c96d33..66c59261a 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.rb
@@ -2,11 +2,10 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Rails.application.config.secret_token = 'ea08916110cae7f10fe9e1f7c7cb8c1fee13c3c3bee35180ac3061c370bd9ad985f28fcf2eb5f5684d0d618855efdeb862918628e994ed3e7fc806777428ef40'
+Rails.application.config.secret_token = '3484b78b0f9d88f40cd44a20cf647140e5900632d0c9b85e1fd91dc539811d243f2f0756f791019c'
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index de79a36eb..f4e36ea89 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.session_store :cookie_store, :key => '_diaspora_session'
diff --git a/config/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 34d9eb7c1..26ff8044d 100644
--- a/config/locales/devise/devise.cs.yml
+++ b/config/locales/devise/devise.cs.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 cs:
   errors:
     messages:
diff --git a/config/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 5d6d6049a..d8b6d94f4 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -1,42 +1,41 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.  
- 
+#   the COPYRIGHT file.
 
-cy:  
-  errors:    
-    messages:      
-       not_found: "ni chanfuwyd"      
-       already_confirmed: "cadarnhawyd eisioes"      
-       not_locked: "heb ei gloi"   
-       
-  devise:    
-    failure:      
+cy:
+  errors:
+    messages:
+       not_found: "ni chanfuwyd"
+       already_confirmed: "cadarnhawyd eisioes"
+       not_locked: "heb ei gloi"
+
+  devise:
+    failure:
       unauthenticated: "Mae angen i chi arwyddo i mewn neu ymuno cyn parhau."
       unconfirmed: "Rhaid i chi gadarnhau eich cyfrif cyn parhau."
       locked: "Mae eich cyfrif wedi'i gloi."
-      invalid: "E-bost neu gyfrinair annilys."      
-      invalid_token: "Tocyn dilysu annilys."      
-      timeout: "Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau."      
-      inactive: "Nid yw eich cyfrif wedi'i actifadu."    
-    sessions:      
-      signed_in: "Arwyddwyd i fewn yn llwyddiannus."      
-      signed_out: "Arwyddwyd allan yn llwyddiannus."    
-    passwords:      
-      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."      
-      updated: "Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn."    
-    confirmations:      
-      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."      
-      confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."    
-    registrations:      
-      signed_up: "Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi."      
-      updated: "Diweddarwyd eich cyfrif yn llwyddiannus."      
-      destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."    
-    unlocks:      
-      send_instructions: "Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau."      
-      unlocked: "Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."    
-    mailer:      
-      confirmation_instructions: "Cyfarwyddiadau cadarnhad."      
-      reset_password_instructions: "Ailosod cyfarwyddiadau cyfrinair"      
-      unlock_instructions: "Cyfarwyddiadau Datgloi" 
-      
+      invalid: "E-bost neu gyfrinair annilys."
+      invalid_token: "Tocyn dilysu annilys."
+      timeout: "Mae eich sesiwn wedi dod i ben, arwyddwch i mewn eto i barhau."
+      inactive: "Nid yw eich cyfrif wedi'i actifadu."
+    sessions:
+      signed_in: "Arwyddwyd i fewn yn llwyddiannus."
+      signed_out: "Arwyddwyd allan yn llwyddiannus."
+    passwords:
+      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
+      updated: "Newidiwyd eich cyfrinair yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+    confirmations:
+      send_instructions: "Byddwch yn derbyn e-bost â chyfarwyddiadau ar sut i gadarnhau eich cyfrif mewn ychydig funudau."
+      confirmed: "Cadarnhawyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+    registrations:
+      signed_up: "Rydych chi wedi arwyddo i fyny yn llwyddiannus. Anfonwyd cadarnhad at eich e-bost os yw wedi'i alluogi."
+      updated: "Diweddarwyd eich cyfrif yn llwyddiannus."
+      destroyed: "Hwyl fawr! Canslwyd eich cyfrif yn llwyddiannus. Rydym yn gobeithio gweld chi eto yn fuan."
+    unlocks:
+      send_instructions: "Byddwch yn derbyn e-bost gyda cyfarwyddiadau ar sut i agor eich cyfrif mewn ychydig funudau."
+      unlocked: "Datglowyd eich cyfrif yn llwyddiannus. Rydych chi wedi arwyddo i fewn."
+    mailer:
+      confirmation_instructions: "Cyfarwyddiadau cadarnhad."
+      reset_password_instructions: "Ailosod cyfarwyddiadau cyfrinair"
+      unlock_instructions: "Cyfarwyddiadau Datgloi"
+
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 7c0e0e758..e6608c181 100644
--- a/config/locales/devise/devise.de.yml
+++ b/config/locales/devise/devise.de.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 de:
   errors:
     messages:
@@ -12,30 +11,30 @@ de:
 
   devise:
     failure:
-      unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.'
-      unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.'
-      locked: 'Dein Konto ist gesperrt.'
-      invalid: 'Ungültige E-Mail-Adresse oder Passwort.'
-      invalid_token: 'Ungültiger Authentifizierungstoken.'
-      timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren.'
-      inactive: 'Dein Konto wurde noch nicht aktiviert.'
+      unauthenticated: "Du musst dich anmelden oder registrieren um fortzufahren."
+      unconfirmed: "Du musst dein Konto bestätigen um fortzufahren."
+      locked: "Dein Konto ist gesperrt."
+      invalid: "Ungültige E-Mail-Adresse oder Passwort."
+      invalid_token: "Ungültiger Authentifizierungstoken."
+      timeout: "Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren."
+      inactive: "Dein Konto wurde noch nicht aktiviert."
     sessions:
-      signed_in: 'Erfolgreich angemeldet.'
-      signed_out: 'Erfolgreich abgemeldet.'
+      signed_in: "Erfolgreich angemeldet."
+      signed_out: "Erfolgreich abgemeldet."
     passwords:
-      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt.'
-      updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet.'
+      send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt."
+      updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet."
     confirmations:
-      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.'
-      confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.'
+      send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst."
+      confirmed: "Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet."
     registrations:
-      signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.'
-      updated: 'Dein Konto wurde aktualisiert.'
-      destroyed: 'Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen.'
+      signed_up: "Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet."
+      updated: "Dein Konto wurde aktualisiert."
+      destroyed: "Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen."
     unlocks:
-      send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.'
-      unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.'
+      send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst."
+      unlocked: "Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet."
     mailer:
-      confirmation_instructions: 'Instruktionen zur Bestätigung'
-      reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts'
-      unlock_instructions: 'Instruktionen zum Entsperren'
+      confirmation_instructions: "Instruktionen zur Bestätigung"
+      reset_password_instructions: "Instruktionen zum Zurücksetzen des Passworts"
+      unlock_instructions: "Instruktionen zum Entsperren"
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 8876bc5bf..7ab686bd4 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 en:
   errors:
     messages:
diff --git a/config/locales/devise/devise.fi.yml b/config/locales/devise/devise.fi.yml
index 9109b40a8..c77ead4b2 100644
--- a/config/locales/devise/devise.fi.yml
+++ b/config/locales/devise/devise.fi.yml
@@ -1,7 +1,7 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
-#   Translator: jarkko moilanen, jm60697@gmail.com  
+#   Translator: jarkko moilanen, jm60697@gmail.com
 
 fi:
   errors:
diff --git a/config/locales/devise/devise.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
index 9578af9d9..6fe14382e 100644
--- a/config/locales/devise/devise.fr-informal.yml
+++ b/config/locales/devise/devise.fr-informal.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 fr-informal:
   errors:
     messages:
diff --git a/config/locales/devise/devise.fr.yml b/config/locales/devise/devise.fr.yml
index b8691eb3a..240e9d967 100644
--- a/config/locales/devise/devise.fr.yml
+++ b/config/locales/devise/devise.fr.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 fr:
   errors:
     messages:
diff --git a/config/locales/devise/devise.he.yml b/config/locales/devise/devise.he.yml
new file mode 100644
index 000000000..c33cfa678
--- /dev/null
+++ b/config/locales/devise/devise.he.yml
@@ -0,0 +1,41 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+#   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
+
+he:
+  errors:
+    messages:
+      not_found: "לא נמצא"
+      already_confirmed: "כבר אושר"
+      not_locked: "לא ננעל"
+
+  devise:
+    failure:
+      unauthenticated: "עליך להיכנס או להירשם לפני המשך הפעילות."
+      unconfirmed: "עליך לאמת את חשבונך לפי המשך הפעילות."
+      locked: "חשבונך נעול."
+      invalid: "הססמה או הדוא״ל שגויים."
+      invalid_token: "אסימון האימות שגוי."
+      timeout: "ההפעלה שלך פגה, נא להיכנס שוב כדי להמשיך."
+      inactive: "חשבונך לא הופעל עדין."
+    sessions:
+      signed_in: "נכנסת בהצלחה."
+      signed_out: "יצאת בהצלחה."
+    passwords:
+      send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאפס את ססמתך."
+      updated: "ססמתך הוחלפה בהצלחה. נכנסת כעת."
+    confirmations:
+      send_instructions: "בעוד מספר דקות תתקבל לתיבת הדוא״ל שלך הודעה עם הנחיות כיצד לאמת את חשבונך."
+      confirmed: "חשבונך אומת בהצלחה. נכנסת כעת."
+    registrations:
+      signed_up: "נרשמת בהצלחה. הודעת אימות תישלח אליך לדוא״ל במידה שהוגדרה."
+      updated: "חשבונך עודכן בהצלחה."
+      destroyed: "להתראות! חשבונך בוטל בהצלחה. מקווים לראותך שוב בקרוב."
+    unlocks:
+      send_instructions: "בעוד מספר דקות תתקבל לתיבת הודא״ל שלך הודעה עם הנחיות כיצד לשחרר את חשבונך."
+      unlocked: "חשבונך שוחרר בהצלחה. נכנסת כעת."
+    mailer:
+      confirmation_instructions: "הנחיות לאימות"
+      reset_password_instructions: "הנחיות לאיפוס הססמה"
+      unlock_instructions: "הנחיות לשחרור"
diff --git a/config/locales/devise/devise.it.yml b/config/locales/devise/devise.it.yml
index 76f761e37..96044d191 100644
--- a/config/locales/devise/devise.it.yml
+++ b/config/locales/devise/devise.it.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 it:
   errors:
     messages:
diff --git a/config/locales/devise/devise.lt.yml b/config/locales/devise/devise.lt.yml
index d6e33c1cb..8ae8f027b 100644
--- a/config/locales/devise/devise.lt.yml
+++ b/config/locales/devise/devise.lt.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 lt:
   errors:
     messages:
diff --git a/config/locales/devise/devise.pl.yml b/config/locales/devise/devise.pl.yml
index a490a1a39..503fb6d61 100644
--- a/config/locales/devise/devise.pl.yml
+++ b/config/locales/devise/devise.pl.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 pl:
   errors:
     messages:
diff --git a/config/locales/devise/devise.pt-BR.yml b/config/locales/devise/devise.pt-BR.yml
index ba2b3b5de..5a39a4734 100644
--- a/config/locales/devise/devise.pt-BR.yml
+++ b/config/locales/devise/devise.pt-BR.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 pt-BR:
   errors:
     messages:
diff --git a/config/locales/devise/devise.pt-PT.yml b/config/locales/devise/devise.pt-PT.yml
index cf16fd20d..c0c955517 100644
--- a/config/locales/devise/devise.pt-PT.yml
+++ b/config/locales/devise/devise.pt-PT.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 pt-PT:
   errors:
     messages:
diff --git a/config/locales/devise/devise.ro.yml b/config/locales/devise/devise.ro.yml
index 63501ea7b..b4d12e6b6 100644
--- a/config/locales/devise/devise.ro.yml
+++ b/config/locales/devise/devise.ro.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 ro:
   errors:
     messages:
diff --git a/config/locales/devise/devise.ru.yml b/config/locales/devise/devise.ru.yml
index 670d57026..1ac626861 100644
--- a/config/locales/devise/devise.ru.yml
+++ b/config/locales/devise/devise.ru.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 ru:
   errors:
     messages:
diff --git a/config/locales/devise/devise.sv.yml b/config/locales/devise/devise.sv.yml
index b434666ce..c83179bde 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -1,7 +1,6 @@
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
- 		
 
 sv:
   errors:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 91c904dc1..898428db2 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.yml
@@ -2,9 +2,218 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 cs:
   hello: "Dobrý Den"
+  application:
+      helper:
+          unknown_person: "neznámá osoba"
+          new_requests: "nové žádosti"
+  dashboards:
+      helper:
+          home: "domů"
+  datetime:
+      distance_in_words:
+          less_than_x_seconds: "méně než %{count} sekund"
+          half_a_minute: "půl minuty"
+          less_than_x_minutes: "méně než %{count} minut"
+          x_minutes: "%{count} minuty"
+          about_x_hours: "zhruba %{count} hodin"
+          x_days: "%{count} dní"
+          about_x_months: "zhruba %{count} měsíců"
+          x_months: "%{count} měsíců"
+          about_x_years: "zhruba %{count} let"
+          over_x_years: "přez %{count} let"
+          almost_x_years: "skoro %{count} let"
+  error_messages:
+      helper:
+          invalid_fields: "Neplatná pole"
+          correct_the_following_errors_and_try_again: "Opravte následující chyby a zkuste to znovu."
+  people:
+      helper:
+           results_for: " vysledky vyhledávání %{params}"
+           people_on_pod_are_aware_of: " people on pod are aware of"
+  layouts:
+      application:
+          edit_profile: "upravit profil"
+          logout: "odhlásit se"
+  shared:
+      aspect_nav:
+          all_aspects: "Všechny aspekty"
+          manage: "Spravovat"
+          manage_your_aspects: "Spravovat vaše aspekty"
+      sub_header:
+          all_aspects: "Všechny aspekty"
+          manage_aspects: "Spravovat aspekty"
+      publisher:
+          share: "Sdělit"
+      aspect_friends:
+          add_friends: "přidat přátele"
+  albums:
+      album:
+          you: "vy"
+      new_album:
+          create: "vytvořit"
+          add_a_new_album: "Přidat nové album"
+      show: 
+          edit_album: "Upravit album"
+          albums: "alba"
+          updated: "aktualizované"
+          by: "uživatelem"
+      edit:
+          editing: "Upravuje se"
+          updated: "aktualizováno"
+          are_you_sure: "Jste si jisti?"
+          delete_album: "Smazat Album"
+          cancel: "Zrušit"
+      index:
+          home: "doma"
+          new_album: "Nové Album"
+      create:
+          success: "Vytvořili jste nové album nazvané %{name}."
+      update:
+          success: "Album %{name} úspěšně upraveno."
+          failure: "Nepodařilo se upravit album %{name}."
+      destroy:
+          success: "Album %{name} smazáno."
+      helper:
+          friends_albums: "Alba přátel"
+          your_albums: "Vaše Alba"
+  aspects:
+      index:
+          photos: "fotografie"
+      show:
+          photos: "fotografie"
+      manage:
+          add_a_new_aspect: "Přidat aspekt"
+          add_a_new_friend:  "Přidat nového přítele"
+          show: "Show"
+          update_aspects: "Aktualizovat aspekty"
+          requests: "Žádosti"
+          ignore_remove: "Ignorovat/Odebrat"
+      new_aspect:
+          add_a_new_aspect: "Přidat nový aspekt"
+          create: "Vytvořit"
+      create:
+          success: "Řekněte Diaspoře kdo může vidět váš nový aspekt kliknutím na plus na levé straně."
+      destroy:
+          success: "%{name} byl úspěšně odebrán."
+      update:
+          success: "Váš aspekt, %{name}, byl úspěšně upraven."
+      move_friends:
+          failure: "Úprava aspektu přítelem %{real_name} selhala."
+          success: "Aspekty úspěšně upraveny."
+      move_friend:
+          failure: "nepodařilo se %{inspect}"
+          success: "Nyní svému příteli ukazujete jiný ze svých aspektů."
+      helper:
+          remove: "odebrat"
+          aspect_not_empty: "Aspekt není prázdný"
+  users:
+      edit:
+          editing_profile: "Upravit profil"
+      profile:
+          cancel: "Zrušit"
+          update_profile: "Aktualizovat profil"
+          home: "Domů"
+          diaspora_username: "UŽIVATELSKÉ JMÉNO V DIASPOŘE"
+          info: "Info"
+          picture: "Obrázek"
+          editing_profile: "Upravit profil"
+          albums: "Alba"
+          you_dont_have_any_photos: "Nemáte žádné fotky.   Jděte na stránku"
+          page_to_upload_some:  "a nějaké nahrajte."
+  comments:
+      comment:
+          ago: "nazpět"
+      new_comment:
+          comment: "Komentář"
+  photos:
+      show:
+          prev: "předchozí"
+          full_size: "plná velkost"
+          next: "další"
+          edit_photo: "Upravit fotku"
+          delete_photo: "Smazat fotku"
+          are_you_sure: "Jste si jisti?"
+          comments: "komentáře"
+      edit:
+          editing: "Uprait"
+          are_you_sure: "Jste si jisti?"
+          delete_photo: "Smazat fotku"
+      photo:
+          show_comments: "zobrazit komentáře"
+          posted_a_new_photo_to: "poslal novou fotku do"
+      new:
+          new_photo: "Nová fotka"
+          back_to_list: "Zpět na seznam"
+          post_it: "poslat!"
+      create:
+          runtime_error: "Poslání fotky selhalo.  Jste si jisti, že máte zapnuté pásy?"
+          integrity_error: "Poslání fotky selhalo.  Jste si jisti že to byl obrázek?"
+          type_error: "Poslání fotky selhalo.  Jste si jisti zě byl přidán obrázek?"
+      update:
+          notice: "Fotka úspěšně aktualizována."
+          error:  "Nepodařilo se upravit fotku."
+      destroy:
+          notice: "Fotka smazána."
+  registrations:
+      new:
+          sign_up: "Zapsat se"
+      create:
+          success: "Připojili jste se k Diaspoře!"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "pověz mi něco dobrého"
+          oh_yeah: "ó ano!"
+      status_message:
+          show_comments: "zobrazit komentáře"
+          delete: "Smazat"
+          are_you_sure: "Jste si jisti?"
+      show:
+          status_message: "Zpráva o stavu"
+          comments: "komentáře"
+          are_you_sure: "Jste si jisti?"
+          destroy: "Zničit"
+          view_all: "Zobrazit Vše"
+          message: "Zpráva"
+          owner: "Vlastník"
+      helper:
+          no_message_to_display: "Není k zobrazení žádná zpráva."
+  people:
+      person:
+          add_friend: "přidat přítele"
+          pending_request: "nevyřízené žádosti"
+      index:
+          add_friend: "přidat přítele"
+          real_name: "pravé jméno"
+          diaspora_handle: "adresa v diaspoře"
+          thats_you: "to jste vy!"
+          friend_request_pending: "nevyřízená žádost o přátelství"
+          you_have_a_friend_request_from_this_person: "od této osoby máte žádost o přátelství"
+      new:
+          new_person: "Nová Osoba"
+          back_to_list: "Zpět na Seznam"
+      show:
+          last_seen: "naposledy viděni: %{how_long_ago}"
+          friends_since: "přáteli od: %{how_long_ago}"
+          save: "save"
+          are_you_sure: "Jste si jisti?"
+          remove_friend: "odebrat přítele"
+  requests:
+      new_request:
+          add_a_new_friend_to: "Pridat nového přítele do"
+          enter_a_diaspora_username: "Vložte uživatelské jméno v diaspoře:"
+          your_diaspora_username_is: "Vaše uživatelské jméno v diaspoře je: %{diaspora_handle}"
+          friends_username: "Uživatelské jméno přítele"
+      destroy:
+          success: "Nyní jste přáteli."
+          error: "Prosím vyberte aspekt!"
+          ignore: "Ignorovat žádost o přátelství."
+      create:
+          error: "Semínko diaspory s touto adresou nenalezeno!"
+          already_friends: "S %{destination_url} už jste přáteli!"
+          success: "byla poslána žádost o přátelství na %{destination_url}"
+          horribly_wrong: "Něco se ošklivě pokazilo."
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index b7d9c9af4..cd1c7dbd6 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -30,7 +29,7 @@ cy:
       new_album:
           create: "creu"
           add_a_new_album: "Ychwanegu albwm newydd"
-      show: 
+      show:
           edit_album: "Golygu Albwm"
           albums: "albymau"
           updated: "diweddarwyd"
@@ -70,6 +69,8 @@ cy:
           success:"Cliciwch ar y plus ar y chwith i ddweud wrth Diaspora pwy all weld eich agwedd newydd."
   users:
       edit:
+          editing_profile: "Golygu proffil"
+      profile:
           cancel: "Cancel"
           update_profile: "Diweddaru Proffil"
           home: "Adref"
@@ -140,4 +141,4 @@ cy:
           friends_since: "yn ffrindiau ers: %{how_long_ago}"
           save: "arbed"
           are_you_sure: "Ydych chi'n sicr?"
-          remove_friend: "dileu ffrind"
\ No newline at end of file
+          remove_friend: "dileu ffrind"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 1c4dfb4ad..e277a5efd 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Localization file for German. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -14,15 +13,15 @@ de:
           new_requests: "neue Anfrage"
   dashboards:
       helper:
-          home: "home"
+          home: "Startseite"
   error_messages:
       helper:
           invalid_fields: "Ungültige Felder"
-          correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probier es erneut."
+          correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probiere es erneut."
   people:
       helper:
-           results_for: " resultados para %{params}"
-           people_on_pod_are_aware_of: " gente en pod estan al tanto de "
+           results_for: " Resultate für %{params}"
+           people_on_pod_are_aware_of: " people on pod are aware of"
   layouts:
       application:
           edit_profile: "Profil bearbeiten"
@@ -45,7 +44,7 @@ de:
       new_album:
           create: "erstellen"
           add_a_new_album: "Album hinzufügen"
-      show: 
+      show:
           edit_album: "Album bearbeiten"
           albums: "Alben"
           updated: "aktualisiert"
@@ -85,22 +84,24 @@ de:
           add_a_new_aspect: "Neuen Aspekt erstellen"
           create: "Erstellen"
       create:
-          success: "Klicke auf das Plus auf der rechten Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann."
+          success: "Klicke auf das Plus auf der linken Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann."
       destroy:
           success: "%{name} wurde erfolgreich gelöscht."
       update:
           success: "Dein Aspekt, %{name}, wurde erfolgreich geändert."
       move_friends:
-          failure: "Aspect editing failed for friend %{real_name}."
+          failure: "Ändern des Aspekts für deinen Freund %{real_name} fehlgeschlagen."
           success: "Aspekt erfolgreich geändert."
       move_friend:
           error: "didn't work %{inspect}"
-          notice: "You are now showing your friend a different aspect of yourself."
+          notice: "Du zeigst deinem Freund jetzt einen anderen Aspekt von dir."
       helper:
-          remove: "remove"
-          aspect_not_empty: "Aspekt ist nicht leer"          
+          remove: "entfernen"
+          aspect_not_empty: "Aspekt ist nicht leer"
   users:
       edit:
+          editing_profile: "Profil bearbeiten"
+      profile:
           cancel: "Abbrechen"
           update_profile: "Profil aktualisieren"
           home: "Startseite"
@@ -109,8 +110,8 @@ de:
           picture: "Bild"
           editing_profile: "Profil bearbeiten"
           albums: "Alben"
-          you_dont_have_any_photos: "#TODO"
-          page_to_upload_some:  "#TODO"
+          you_dont_have_any_photos: "Du hast keine Fotos! Gehe auf die"
+          page_to_upload_some:  "Seite um welche hochzuladen."
   comments:
       comment:
           # this won't work in german at all. Needs more thorough I18n
@@ -132,18 +133,18 @@ de:
           delete_photo: "Foto löschen"
       photo:
           show_comments: "Kommentare anzeigen"
-          posted_a_new_photo_to: "posted a new photo to"          
+          posted_a_new_photo_to: "neues Foto veröffentlicht bei"
       new:
           new_photo: "Foto erstellen"
           back_to_list: "Zurück zur Liste"
           post_it: "Hochladen"
       create:
-          runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-          integrity_error: "Photo upload failed.  Are you sure that was an image?"
-          type_error: "Photo upload failed.  Are you sure an image was added?"
+          runtime_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass dein Sicherheitsgurt befestigt ist?"
+          integrity_error: "Hochladen eines Fotos fehlgeschlagen.  Bist du sicher, dass das ein Bild war?"
+          type_error: "Hochladen eines Fotos fehlgeschlagen.  Bist du sicher, dass ein Bild hinzugefügt wurde?"
       update:
           notice: "Foto erfolgreich aktualisiert."
-          error:  "Failed to edit photo."
+          error:  "Ändern des Fotos fehlgeschlagen."
       destroy:
           notice: "Foto gelöscht."
   registrations:
@@ -154,7 +155,7 @@ de:
   status_messages:
       new_status_message:
           tell_me_something_good: "Erzähl' mir was schönes!"
-          oh_yeah: "Hey, super!"
+          oh_yeah: "Oh, super!"
       status_message:
           show_comments: "Kommentare anzeigen"
           delete: "Löschen"
@@ -166,32 +167,41 @@ de:
           destroy: "Löschen"
           view_all: "Alle anzeigen"
           message: "Nachricht"
-          owner: "Besitzer"
+          owner: "Eigentümer"
       helper:
-          no_message_to_display: "No message to display."
+          no_message_to_display: "Keine Nachricht zum anzeigen."
   people:
+      person:
+          add_friend: "Freund hinzufügen"
+          pending_request: "Anfrage ausstehend"
       index:
           add_friend: "Freund hinzufügen"
-          real_name: "real name"
+          real_name: "Echter Name"
           diaspora_handle: "diaspora handle"
           thats_you: "das bist du!"
-          friend_request_pending: "Freundschaftsanfrage ausstehend"
-          you_have_a_friend_request_from_this_person: "du hast eine Freundschaftsanfrage von dieser Person"
+          friend_request_pending: "Ausstehende Freundschaftsanfrage"
+          you_have_a_friend_request_from_this_person: "Du hast eine Freundschaftsanfrage von dieser Person"
       new:
           new_person: "Neue Person"
           back_to_list: "Zurück zur Liste"
       show:
           last_seen: "zuletzt gesehen: %{how_long_ago}"
           friends_since: "Freunde seit: %{how_long_ago}"
-          save: "save"
+          save: "speichern"
           are_you_sure: "Bist du sicher?"
-          remove_friend: "remove friend"
+          remove_friend: "Freund entfernen"
+  requests:
+      new_request:
+          add_a_new_friend_to: "Add a new friend to"
+          enter_a_diaspora_username: "Gebe einen Diaspora Benutzernamen ein:"
+          your_diaspora_username_is: "Dein Diaspora Benutzername ist: %{diaspora_handle}"
+          friends_username: "Freundes Benutzername"
       destroy:
           success: "Ihr seid jetzt Freunde."
           error: "Bitte wähle einen Aspekt aus!"
           ignore: "Freundschaftsanfrage ignorieren."
       create:
-          error: "No diaspora seed found with this email!"
+          error: "Kein Diaspora-Seed in dieser E-Mail gefunden!"
           already_friends: "Du bist bereits mit %{destination_url} befreundet!"
           success: "Eine Freundschaftsanfrage wurde an %{destination_url} gesendet."
           horribly_wrong: "Etwas ging tierisch schief."
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8e6542639..838339641 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -45,7 +44,7 @@ en:
       new_album:
           create: "create"
           add_a_new_album: "Add a new album"
-      show: 
+      show:
           edit_album: "Edit Album"
           albums: "albums"
           updated: "updated"
@@ -86,6 +85,7 @@ en:
           create: "Create"
       create:
           success: "Click on the plus on the left side to tell Diaspora who can see your new aspect."
+          failure: "Aspect creation failed."
       destroy:
           success: "%{name} was successfully removed."
       update:
@@ -101,6 +101,8 @@ en:
           aspect_not_empty: "Aspect not empty"
   users:
       edit:
+          editing_profile: "Editing profile"
+      profile:
           cancel: "Cancel"
           update_profile: "Update Profile"
           home: "Home"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 5af6c70aa..5a73715b9 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -2,12 +2,11 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 es:
-  hello: "Hola Mundo"
+  hello: "Hola mundo"
   application:
       helper:
           unknown_person: "persona desconocida"
@@ -18,15 +17,15 @@ es:
   error_messages:
       helper:
           invalid_fields: "Campos Invalidos"
-          correct_the_following_errors_and_try_again: "Corrija los siguentes errores y trate de nuevo."
+          correct_the_following_errors_and_try_again: "Corrija los siguentes errores e intente de nuevo."
   people:
       helper:
            results_for: " resultados para %{params}"
-           people_on_pod_are_aware_of: " gente en pod estan al tanto de "
+           people_on_pod_are_aware_of: " personas en pod estan al tanto de"
   layouts:
       application:
           edit_profile: "editar perfil"
-          logout: "desloguear"
+          logout: "cerrar sesión"
   shared:
       aspect_nav:
           all_aspects: "Todos los Aspectos"
@@ -43,29 +42,29 @@ es:
       album:
           you: "usted"
       new_album:
-          create: "Crear"
+          create: "crear"
           add_a_new_album: "Añade un nuevo álbum"
-      show: 
+      show:
           edit_album: "Editar Álbum"
           albums: "álbumes"
-          updated: "actualizar"
+          updated: "actualizado"
           by: "por"
       edit:
           editing: "Editando"
           updated: "actualizado"
-          are_you_sure: "Esta seguro?"
+          are_you_sure: "¿Está seguro?"
           delete_album: "Eliminar Álbum"
           cancel: "Cancelar"
       index:
           home: "home"
           new_album: "Nuevo Álbum"
       create:
-          success: "Creo el álbum llamado %{name}."
+          success: "Has creado el álbum llamado %{name}."
       update:
-          success: "Álbum %{name} fue editado exitosamente."
-          failure: "Fallo el editar el álbum %{name}."
+          success: "El álbum %{name} fue editado exitosamente."
+          failure: "Fallo al editar el álbum %{name}."
       destroy:
-          success: "Álbum %{name} fue eliminado."
+          success: "El álbum %{name} fue eliminado."
       helper:
           friends_albums: "Álbumes de amigos"
           your_albums: "Tus Álbumes"
@@ -75,38 +74,41 @@ es:
       show:
           photos: "fotos"
       manage:
-          add_a_new_aspect: "Añadir nuevo aspecto"
-          add_a_new_friend:  "Añadir nuevo amigo"
+          add_a_new_aspect: "Añadir un nuevo aspecto"
+          add_a_new_friend:  "Añadir un nuevo amigo"
           show: "Mostrar"
           update_aspects: "Actualizar Aspectos"
-          requests: "Requests"
+          requests: "Peticiones"
           ignore_remove: "Ignorar/Remover"
       new_aspect:
-          add_a_new_aspect: "Añadir nuevo aspecto"
+          add_a_new_aspect: "Añadir un nuevo aspecto"
           create: "Crear"
       create:
-          success:"Pulsa en el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
+          success:"Pulsa el signo de mas a la izquierda para escojer quien puede ver su nuevo aspecto."
+          failure: "La creación del Aspecto falló."
       destroy:
-          success: "%{name} fue removido exitosamente."
+          success: "%{name} fue eliminado exitosamente."
       update:
           success: "Su aspecto, %{name}, fue editado exitosamente."
       move_friends:
           failure: "Fallo el editar aspecto para el amigo %{real_name}."
-          success: "Los aspectos fueron editados exitosamente."
+          success: "Aspectos editados exitosamente."
       move_friend:
-          error: "no funciono %{inspect}"
+          error: "no funcionó %{inspect}"
           notice: "Ahora estas mostrando a tu amigo un aspecto diferente de ti."
       helper:
-          remove: "remover"
-          aspect_not_empty: "Aspecto no esta vacio"
+          remove: "eliminar"
+          aspect_not_empty: "Aspecto no vacio"
   users:
       edit:
+          editing_profile: "Editando perfil"
+      profile:
           cancel: "Cancelar"
           update_profile: "Actualizar Perfil"
           home: "Home"
-          diaspora_username: "USUARIO DE DIASPORA"
+          diaspora_username: "NOMBRE DE USUARIO DE DIASPORA"
           info: "Info"
-          picture: "Picture"
+          picture: "Foto"
           editing_profile: "Editando perfil"
           albums: "Álbums"
           you_dont_have_any_photos: "No tienes ninguna foto!  ve a la pagina"
@@ -115,41 +117,41 @@ es:
       comment:
           ago: "atras"
       new_comment:
-          comment: "Commentario"
+          comment: "Comentario"
   photos:
       show:
           prev: "prev"
-          full_size: "tamaño actual"
+          full_size: "tamaño completo"
           next: "prox"
           edit_photo: "Editar Foto"
           delete_photo: "Eliminar Foto"
-          are_you_sure: "Esta seguro?"
+          are_you_sure: "¿Está seguro?"
           comments: "comentarios"
       edit:
           editing: "Editando"
-          are_you_sure: "Esta seguro?"
+          are_you_sure: "¿Está seguro?"
           delete_photo: "Eliminar Foto"
       photo:
           show_comments: "mostrar comentarios"
           posted_a_new_photo_to: "a puesto una nueva foto en"
       new:
           new_photo: "Nueva Foto"
-          back_to_list: "Devuelta a la lista"
+          back_to_list: "Volver a la lista"
           post_it: "post it!"
       create:
           runtime_error: "Photo upload failed.  Are you sure that your seatbelt is fastened?"
-          integrity_error: "Photo upload failed.  Are you sure that was an image?"
-          type_error: "Photo upload failed.  Are you sure an image was added?"
+          integrity_error: "Falló carga de la foto.  ¿Está seguro de que era una imagen?"
+          type_error: "Falló carga de la foto.  ¿Está seguro de que una imagen fue añadida?"
       update:
-          notice: "Photo successfully updated."
-          error:  "Failed to edit photo."
+          notice: "Foto actualizada satisfactoriamente."
+          error:  "Falló la edición de la foto."
       destroy:
-          notice: "Photo deleted."
+          notice: "Foto eliminada."
   registrations:
       new:
-          sign_up: "Registrate"
+          sign_up: "Regístrate"
       create:
-          success: "Esta registrado en Diaspora!"
+          success: "Se ha unido a Diaspora!"
   status_messages:
       new_status_message:
           tell_me_something_good: "dime algo bueno"
@@ -161,13 +163,13 @@ es:
       show:
           status_message: "Mensaje de status"
           comments: "comentarios"
-          are_you_sure: "Esta seguro?"
-          destroy: "Destruir"
+          are_you_sure: "¿Está seguro?"
+          destroy: "Borrar"
           view_all: "Ver Todos"
           message: "Mensaje"
           owner: "Dueño"
       helper:
-          no_message_to_display: "No hay mensajes que mostrar."          
+          no_message_to_display: "No hay mensajes que mostrar."
   people:
       person:
           add_friend: "añadir amigo"
@@ -177,20 +179,20 @@ es:
           real_name: "nombre real"
           diaspora_handle: "usuario en diaspora"
           thats_you: "ese eres tu!"
-          friend_request_pending: "friend request pending"
-          you_have_a_friend_request_from_this_person: "you have a friend request from this person"          
+          friend_request_pending: "petición de amistad pendiente"
+          you_have_a_friend_request_from_this_person: "tienes una petición de amistad de esta persona"
       show:
           last_seen: "ultima vez visto: %{how_long_ago}"
           friends_since: "amigos desde: %{how_long_ago}"
           save: "guardar"
-          are_you_sure: "Esta seguro?"
-          remove_friend: "remover amigo"
+          are_you_sure: "¿Está seguro?"
+          remove_friend: "eliminar amigo"
   requests:
       new_request:
           add_a_new_friend_to: "Añade un nuevo amigo a "
           enter_a_diaspora_username: "Escribe el usuario de Diaspora:"
           your_diaspora_username_is: "Tu usuario de Diaspora es: %{diaspora_handle}"
-          friends_username: "Usuario de amigo"
+          friends_username: "Nombre de usuario de amigo"
       destroy:
           success: "Ahora son amigos."
           error: "Seleccione un aspecto!"
@@ -199,4 +201,4 @@ es:
           error: "No diaspora seed found with this email!"
           already_friends: "Ya eres amigo de %{destination_url}!"
           success: "Una peticion de amistad se envio a %{destination_url}."
-          horribly_wrong: "Algo horriblemente mal sucedio"
+          horribly_wrong: "Algo horriblemente incorrecto ha sucedido"
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index f70812fdf..1c7950fe5 100644
--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Localization file for French (Informal Honorifics). Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -45,7 +44,7 @@ fr-informal:
       new_album:
           create: "créer"
           add_a_new_album: "Ajouter un nouvel album"
-      show: 
+      show:
           edit_album: "Éditer l’album"
           albums: "albums"
           updated: "mis à jour"
@@ -101,6 +100,8 @@ fr-informal:
           aspect_not_empty: "L’aspect n’est pas vide"
   users:
       edit:
+          editing_profile: "Édition du profil"
+      profile:
           cancel: "Annuler"
           update_profile: "Mettre à jour le profil"
           home: "Accueil"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 6d77dcf00..bab6f3852 100644
--- a/config/locales/diaspora/fr.yml
+++ b/config/locales/diaspora/fr.yml
@@ -44,7 +44,7 @@ fr:
       new_album:
           create: "créer"
           add_a_new_album: "Ajouter un nouvel album"
-      show: 
+      show:
           edit_album: "Éditer l’album"
           albums: "albums"
           updated: "mis à jour"
@@ -87,6 +87,8 @@ fr:
           success:"Cliquez sur plus situé sur le côté gauche afin d’en informer Diaspora qui peut voir votre nouvel aspect."
   users:
       edit:
+          editing_profile: "Édition du profil"
+      profile:
           cancel: "Annuler"
           update_profile: "Mettre à jour le profil"
           home: "Accueil"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
new file mode 100644
index 000000000..47f2a52c2
--- /dev/null
+++ b/config/locales/diaspora/he.yml
@@ -0,0 +1,208 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+#   Translated to Hebrew by Yaron Shahrabani <sh.yaron@gmail.com>, 2010.
+
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+he:
+  hello: "שלום עולם"
+  application:
+      helper:
+          unknown_person: "אדם לא ידוע"
+          new_requests: "בקשות חדשות"
+  dashboards:
+      helper:
+          home: "בית"
+  error_messages:
+      helper:
+          invalid_fields: "שדות שגויים"
+          correct_the_following_errors_and_try_again: "יש לתקן את השגיאות הבאות ולנסות שוב."
+  people:
+      helper:
+           results_for: " תוצאות עבור %{params}"
+           people_on_pod_are_aware_of: " אנשים בפוד מודעים לכך"
+  layouts:
+      application:
+          edit_profile: "עריכת הפרופיל"
+          logout: "יציאה"
+  shared:
+      aspect_nav:
+          all_aspects: "כל ההיבטים"
+          manage: "ניהול"
+          manage_your_aspects: "ניהול ההיבטים שלך"
+      sub_header:
+          all_aspects: "כל ההיבטים"
+          manage_aspects: "ניהול ההיבטים"
+      publisher:
+          share: "שיתוף"
+      aspect_friends:
+          add_friends: "הוספת חברים"
+  albums:
+      album:
+          you: "את/ה"
+      new_album:
+          create: "יצירה"
+          add_a_new_album: "הוספת אלבום חדש"
+      show: 
+          edit_album: "עריכת אלבום"
+          albums: "אלבומים"
+          updated: "תאריך העדכון"
+          by: "על ידי"
+      edit:
+          editing: "עריכה"
+          updated: "תאריך העדכון"
+          are_you_sure: "בבטחה?"
+          delete_album: "מחיקת אלבום"
+          cancel: "ביטול"
+      index:
+          home: "בית"
+          new_album: "אלבום חדש"
+      create:
+          success: "יצרת אלבום בשם %{name}."
+      update:
+          success: "האלבום %{name} נערך בהצלחה."
+          failure: "אירע כשל בעריכת האלבום %{name}."
+      destroy:
+          success: "האלבום %{name} נמחק."
+      helper:
+          friends_albums: "אלבומים של חברים"
+          your_albums: "האלבומים שלך"
+  aspects:
+      index:
+          photos: "תמונות"
+      show:
+          photos: "תמונות"
+      manage:
+          add_a_new_aspect: "הוספת היבט חדש"
+          add_a_new_friend:  "הוספת חבר חדש"
+          show: "הצגה"
+          update_aspects: "עדכון ההיבטים"
+          requests: "בקשות"
+          ignore_remove: "התעלמות/הסרה"
+      new_aspect:
+          add_a_new_aspect: "הוספת היבט חדש"
+          create: "יציאה"
+      create:
+          success: "יש ללחוץ על סמל הפלוס שמימין כדי לומר לדיאספורה מי יעול לצפות בהיבט החדש שלך."
+      destroy:
+          success: "%{name} הוסר בהצלחה."
+      update:
+          success: "ההיבט שלך, %{name}, נערך בהצלחה."
+      move_friends:
+          failure: "עריכת ההיבט נכשלה עבור החבר %{real_name}."
+          success: "ההיבטים נערכו בהצלחה."
+      move_friend:
+          failure: "לא עבד %{inspect}"
+          success: "כעת יופיע בפני החברים שלך היבט אחר שלך."
+      helper:
+          remove: "הסרה"
+          aspect_not_empty: "ההיסט אינו ריק"
+  users:
+      edit:
+          editing_profile: "עריכת הפרופיל"
+      profile:
+          cancel: "ביטול"
+          update_profile: "עדכון הפרופיל"
+          home: "בית"
+          diaspora_username: "שם המשתמש בדיאספורה"
+          info: "פרטים"
+          picture: "תמונה"
+          editing_profile: "עריכת הפרופיל"
+          albums: "אלבומים"
+          you_dont_have_any_photos: "אין לך תמונות!  באפשרותך לגשת לעמוד"
+          page_to_upload_some:  "כדי להעלות כמה."
+  comments:
+      comment:
+          ago: "לפני"
+      new_comment:
+          comment: "הערה"
+  photos:
+      show:
+          prev: "הקודמת"
+          full_size: "גודל מלא"
+          next: "הבאה"
+          edit_photo: "עריכת תמונה"
+          delete_photo: "מחיקת תמונה"
+          are_you_sure: "בבטחה?"
+          comments: "הערות"
+      edit:
+          editing: "עריכה"
+          are_you_sure: "בבטחה?"
+          delete_photo: "מחיקת תמונה"
+      photo:
+          show_comments: "הצגת הערות"
+          posted_a_new_photo_to: "פורסמה תמונה חדשה אל"
+      new:
+          new_photo: "תמונה חדשה"
+          back_to_list: "חזרה לרשימה"
+          post_it: "פרסום!"
+      create:
+          runtime_error: "העלאת התמונה נכשלה.  האם החגורה שלך מהודקת?"
+          integrity_error: "העלאת התמונה נכשלה.  האם זו באמת הייתה תמונה?"
+          type_error: "העלאת התמונה נכשלה.  האם באמת נוספה תמונה?"
+      update:
+          notice: "התמונה עודכנה בהצלחה."
+          error:  "אירע כשל בעריכת התמונה."
+      destroy:
+          notice: "התמונה נמחקה."
+  registrations:
+      new:
+          sign_up: "הרשמה"
+      create:
+          success: "הצטרפת לדיאספורה!"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "בא לי לשמוע סיפור טוב"
+          oh_yeah: "אחלה!"
+      status_message:
+          show_comments: "הצגת הערות"
+          delete: "מחיקה"
+          are_you_sure: "בבטחה?"
+      show:
+          status_message: "הודעת מצב"
+          comments: "הערות"
+          are_you_sure: "בבטחה?"
+          destroy: "הריבה"
+          view_all: "צפייה בכול"
+          message: "הודעה"
+          owner: "בעלים"
+      helper:
+          no_message_to_display: "אין הודעה להצגה."
+  people:
+      person:
+          add_friend: "הוספת חבר"
+          pending_request: "בקשה ממתינה"
+      index:
+          add_friend: "הוספת חבר"
+          real_name: "שם אמתי"
+          diaspora_handle: "כינוי בדיאספורה"
+          thats_you: "מדובר בך!"
+          friend_request_pending: "בקשת החברות ממתינה"
+          you_have_a_friend_request_from_this_person: "יש לך בקשת חברות מאדם זה"
+      new:
+          new_person: "אדם חדש"
+          back_to_list: "חזרה לרשימה"
+      show:
+          last_seen: "פעילות אחרונה: %{how_long_ago}"
+          friends_since: "חברים מאז: %{how_long_ago}"
+          save: "שמירה"
+          are_you_sure: "בבטחה?"
+          remove_friend: "הסרת חבר"
+  requests:
+      new_request:
+          add_a_new_friend_to: "הוספת חבר חדש אל"
+          enter_a_diaspora_username: "נא להזין שם משתמש בדיאספורה:"
+          your_diaspora_username_is: "שם המשתמש שלך בדיאספורה הוא: %{diaspora_handle}"
+          friends_username: "שם המשתמש של החבר"
+      destroy:
+          success: "אתם חברים כעת."
+          error: "נא לבחור בהיבט!"
+          ignore: "בקשות חברות מהן התעלמת."
+      create:
+          error: "לא נמצא זרע של דיאספורה בכתובת דוא״ל זו!"
+          already_friends: "את/ה ו%{destination_url} כבר חברים!"
+          success: "בקשת חברות נשלחה אל %{destination_url}."
+          horribly_wrong: "משהו השתבש לגמרי."
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 4cce93d73..24681fbe0 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -2,9 +2,205 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Italian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 it:
-  hello: "Ciao Mondo"
+  hello: "Ciao mondo"
+  application:
+      helper:
+          unknown_person: "persona sconosciuta"
+          new_requests: "nuove richieste"
+  dashboards:
+      helper:
+          home: "home"
+  error_messages:
+      helper:
+          invalid_fields: "Campi non validi"
+          correct_the_following_errors_and_try_again: "Correggi i seguenti errori e riprova."
+  people:
+      helper:
+           results_for: " risultati per %{params}"
+           people_on_pod_are_aware_of: " persone su pod sono consapevoli di"
+  layouts:
+      application:
+          edit_profile: "modifica profilo"
+          logout: "disconnetti"
+  shared:
+      aspect_nav:
+          all_aspects: "Tutti gli Aspetti"
+          manage: "Gestisci"
+          manage_your_aspects: "Gestisci i tuoi Aspetti"
+      sub_header:
+          all_aspects: "Tutti gli Aspetti"
+          manage_aspects: "Gestisci Aspetti"
+      publisher:
+          share: "Condividi"
+      aspect_friends:
+          add_friends: "aggiungi amici"
+  albums:
+      album:
+          you: "tu"
+      new_album:
+          create: "crea"
+          add_a_new_album: "Aggiungi un nuovo album"
+      show:
+          edit_album: "Modifica album"
+          albums: "album"
+          updated: "aggiornato"
+          by: "da"
+      edit:
+          editing: "Modifica"
+          updated: "aggiornato"
+          are_you_sure: "Sei sicuro?"
+          delete_album: "Elimina album"
+          cancel: "Annulla"
+      index:
+          home: "home"
+          new_album: "Nuovo album"
+      create:
+          success: "Hai creato un album chiamato %{name}."
+      update:
+          success: "L'album %{name} è stato modificato."
+          failure: "Modifica dell'album %{name} fallita."
+      destroy:
+          success: "L'album %{name} è stato eliminato."
+      helper:
+          friends_albums: "Album degli amici"
+          your_albums: "I tuoi album"
+  aspects:
+      index:
+          photos: "foto"
+      show:
+          photos: "foto"
+      manage:
+          add_a_new_aspect: "Aggiungi un nuovo aspetto"
+          add_a_new_friend:  "Aggiungi un nuovo amico"
+          show: "Mostra"
+          update_aspects: "Aggiorna Aspetti"
+          requests: "Richieste"
+          ignore_remove: "Ignora/Rimuovi"
+      new_aspect:
+          add_a_new_aspect: "Aggiungi un nuovo aspetto"
+          create: "Crea"
+      create:
+          success: "Clicca sul segno più nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto."
+      destroy:
+          success: "%{name} è stato rimosso con successo."
+      update:
+          success: "Il tuo aspetto, %{name}, è stato modificato con successo."
+      move_friends:
+          failure: "Modifica dell'aspetto fallita per l'amico %{real_name}."
+          success: "Aspetti modificati con successo."
+      move_friend:
+          failure: "non ha funzionato %{inspect}"
+          success: "Adesso stai mostrando al tuo amico un aspetto differente di te stesso."
+      helper:
+          remove: "rimuovi"
+          aspect_not_empty: "Aspetto non vuoto"
+  users:
+      edit:
+          editing_profile: "Modifica del profilo"
+      profile:
+          cancel: "Annulla"
+          update_profile: "Aggiorna profilo"
+          home: "Home"
+          diaspora_username: "NOME UTENTE DIASPORA"
+          info: "Info"
+          picture: "Immagine"
+          editing_profile: "Modifica del profilo"
+          albums: "Album"
+          you_dont_have_any_photos: "Non hai nessuna foto! Vai alla pagina"
+          page_to_upload_some:  "per caricarne qualcuna."
+  comments:
+      comment:
+          ago: "fa"
+      new_comment:
+          comment: "Commento"
+  photos:
+      show:
+          prev: "indietro"
+          full_size: "dimensione intera"
+          next: "avanti"
+          edit_photo: "Modifica foto"
+          delete_photo: "Elimina foto"
+          are_you_sure: "Sei sicuro?"
+          comments: "commenti"
+      edit:
+          editing: "Modifica"
+          are_you_sure: "Sei sicuro?"
+          delete_photo: "Elimina foto"
+      photo:
+          show_comments: "mostra commenti"
+          posted_a_new_photo_to: "ha caricato una nuova foto in"
+      new:
+          new_photo: "Nuova foto"
+          back_to_list: "Torna all'elenco"
+          post_it: "inseriscila!"
+      create:
+          runtime_error: "Caricamento della foto fallito. Hai allacciato le cinture?"
+          integrity_error: "Caricamento della foto fallito. Sei sicuro che era un'immagine?"
+          type_error: "Caricamento della foto fallito. Sei sicuro di aver aggiunto un'immagine?"
+      update:
+          notice: "Foto aggiornata con successo."
+          error:  "Modifica della foto fallita."
+      destroy:
+          notice: "Foto eliminata."
+  registrations:
+      new:
+          sign_up: "Iscriviti"
+      create:
+          success: "Ti sei unito a Diaspora!"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "dimmi qualcosa di buono"
+          oh_yeah: "oh si!"
+      status_message:
+          show_comments: "mostra commenti"
+          delete: "Elimina"
+          are_you_sure: "Sei sicuro?"
+      show:
+          status_message: "Messaggio di stato"
+          comments: "commenti"
+          are_you_sure: "Sei sicuro?"
+          destroy: "Distruggi"
+          view_all: "Vedi tutto"
+          message: "Messaggio"
+          owner: "Proprietario"
+      helper:
+          no_message_to_display: "Nessun messaggio da visualizzare."
+  people:
+      person:
+          add_friend: "aggiungi amico"
+          pending_request: "richiesta in sospeso"
+      index:
+          add_friend: "aggiungi amico"
+          real_name: "nome reale"
+          diaspora_handle: "diaspora handle"
+          thats_you: "sei tu!"
+          friend_request_pending: "richiesta d'amicizia in sospeso"
+          you_have_a_friend_request_from_this_person: "hai una richiesta d'amicizia da questa persona"
+      new:
+          new_person: "Nuova persona"
+          back_to_list: "Torna all'elenco"
+      show:
+          last_seen: "ultima visualizzazione: %{how_long_ago}"
+          friends_since: "amici da: %{how_long_ago}"
+          save: "salva"
+          are_you_sure: "Sei sicuro?"
+          remove_friend: "rimuovi amico"
+  requests:
+      new_request:
+          add_a_new_friend_to: "Aggiungi un amico a"
+          enter_a_diaspora_username: "Inserisci un nome utente Diaspora:"
+          your_diaspora_username_is: "Il tuo nome utente Diaspora è: %{diaspora_handle}"
+          friends_username: "nome utente dell'amico"
+      destroy:
+          success: "Adesso siete amici."
+          error: "Seleziona un aspetto!"
+          ignore: "Ignora richiesta di amicizia."
+      create:
+          error: "Nessun seed Diaspora trovato con questa email!"
+          already_friends: "Sei già amico con %{destination_url}!"
+          success: "Una richiesta di amicizia è stata inviata a %{destination_url}."
+          horribly_wrong: "Qualcosa è andato orribilmente storto."
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index e1a529431..01295e389 100644
--- a/config/locales/diaspora/lt.yml
+++ b/config/locales/diaspora/lt.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Lithuanian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
diff --git a/config/locales/diaspora/pl.yml b/config/locales/diaspora/pl.yml
index 2052779bd..c55b79691 100644
--- a/config/locales/diaspora/pl.yml
+++ b/config/locales/diaspora/pl.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for English. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
diff --git a/config/locales/diaspora/pt-BR.yml b/config/locales/diaspora/pt-BR.yml
index 10425864b..e8ffcc8e1 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -2,12 +2,26 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Portuguese Brazilian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 pt-BR:
   hello: "Olá mundo"
+  application:
+      helper:
+          unknown_person: "pessoa desconhecida"
+          new_requests: "nova requisição"
+  dashboards:
+      helper:
+          home: "casa"
+  error_messages:
+      helper:
+          invalid_fields: "Campos inválidos"
+          correct_the_following_errors_and_try_again: "Corrija os erros a seguir e tente novamente."
+  people:
+      helper:
+           results_for: " resultados para %{params}"
+           people_on_pod_are_aware_of: " pessoas no pod estão conscientes de"
   layouts:
       application:
           edit_profile: "editar perfil"
@@ -51,6 +65,9 @@ pt-BR:
           failure: "Erro ao editar o álbum %{name}."
       destroy:
           success: "O álbum %{name} foi excluído com sucesso."
+      helper:
+          friends_albums: "Álbum de amigos"
+          your_albums: "Seus álbuns"
   aspects:
       index:
           photos: "photos"
@@ -68,12 +85,27 @@ pt-BR:
           create: "Criar"
       create:
           success:"Clique no mais(+) do lado esquerdo para dizer ao Diaspora quem pode ver seu novo aspecto."
+      destroy:
+          success: "%{name} foi removido com sucesso."
+      update:
+          success: "Seu aspecto, %{name}, foi editado com sucesso."
+      move_friends:
+          failure: "Falha ao editar aspecto para o amigo(a) %{real_name}."
+          success: "Aspectos editados com sucesso."
+      move_friend:
+          failure: "não funcionou %{inspect}"
+          success: "Você está agora mostrando um diferente aspecto seu a um amigo(a)."
+      helper:
+          remove: "remover"
+          aspect_not_empty: "Aspecto não está vazio"
   users:
       edit:
+          editing_profile: "Editando perfil"
+      profile:
           cancel: "Cancelar"
           update_profile: "Atualizar Perfil"
           home: "Home"
-          diaspora_username: "USUÁRIO DIASPORA"
+          diaspora_username: "NOME DE USUÁRIO DIASPORA"
           info: "Informações"
           picture: "Imagem"
           editing_profile: "Editando perfil"
@@ -105,9 +137,20 @@ pt-BR:
           new_photo: "Nova Foto"
           back_to_list: "Voltar para a Lista"
           post_it: "enviar!"
+      create:
+          runtime_error: "Envio de foto falhou. Você tem tem certeza que seu sinto de segurança está preso?"
+          integrity_error: "Envio de foto falhou. Você tem certeza que é uma imagem?"
+          type_error: "Envio de foto falhou. Você tem certeza que adicionou uma imagem?"
+      update:
+          notice: "Foto enviada com sucesso."
+          error:  "Falha ao editar foto."
+      destroy:
+          notice: "Foto removida."
   registrations:
       new:
           sign_up: "Cadastro"
+      create:
+          success: "Vocé entrou na Diaspora!"
   status_messages:
       new_status_message:
           tell_me_something_good: "diga-me qualquer coisa legal"
@@ -124,7 +167,12 @@ pt-BR:
           view_all: "Exibir Todas"
           message: "Mensagem"
           owner: "Pertence a"
+      helper:
+          no_message_to_display: "Nenhuma mensagem para ser mostrada."
   people:
+      person:
+          add_friend: "adicionar amigo(a)"
+          pending_request: "requisições pendentes"
       index:
           add_friend: "adicionar amigo(a)"
           real_name: "nome real"
@@ -141,3 +189,18 @@ pt-BR:
           save: "salvar"
           are_you_sure: "Tem certeza?"
           remove_friend: "excluir amigo"
+  requests:
+      new_request:
+          add_a_new_friend_to: "Adicionar novo amigo(a) em"
+          enter_a_diaspora_username: "Digite seu nome de usuário Diaspora:"
+          your_diaspora_username_is: "Seu nome de usuário Diaspora é: %{diaspora_handle}"
+          friends_username: "Nome de usuário do Amigo(a)"
+      destroy:
+          success: "Vocês agora são amigos."
+          error: "Favor selecionar um aspecto!"
+          ignore: "Requisições de amigos ignoradas."
+      create:
+          error: "Nenhum semente Diaspora encontrado com esse email."
+          already_friends: "Você já é amigo(a) de %{destination_url}!"
+          success: "Uma requisição de amizade foi enviada para %{destination_url}."
+          horribly_wrong: "Algo horrível aconteceu."
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index ce3d9abbc..6df399150 100644
--- a/config/locales/diaspora/pt-PT.yml
+++ b/config/locales/diaspora/pt-PT.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Portuguese Portugal. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c99bd2a85..ed3234571 100644
--- a/config/locales/diaspora/ro.yml
+++ b/config/locales/diaspora/ro.yml
@@ -26,7 +26,7 @@ ro:
       new_album:
           create: "crează"
           add_a_new_album: "Album nou"
-      show: 
+      show:
           edit_album: "Editare Album"
           albums: "albume"
           updated: "actualizat"
@@ -66,6 +66,8 @@ ro:
           success:"Click pe semnul plus în partea stângă pentru a indica cine poate accesa noul aspect."
   users:
       edit:
+          editing_profile: "Editare profil"
+      profile:
           cancel: "Renunță"
           update_profile: "Actualizează Profil"
           home: "Home"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index d0d9e8039..daeb35915 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Sample localization file for Russian. Add more files in this directory for other locales.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
@@ -30,7 +29,7 @@ ru:
       new_album:
           create: "создать"
           add_a_new_album: "Добавить новый альбом"
-      show: 
+      show:
           edit_album: "Редактировать альбом"
           albums: "альбомы"
           updated: "обновленные"
@@ -70,6 +69,8 @@ ru:
           success:"Нажмите на плюс слева, для того, что-бы указать Diaspora тех, кто может видеть ваш новый аспект."
   users:
       edit:
+          editing_profile: "Редактирование профиля"
+      profile:
           cancel: "Отмена"
           update_profile: "Обновить профиль"
           home: "Домой"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1caf878b8..1aa9ac2dc 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -2,8 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-# Swedish localization file. 
+# Swedish localization file.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 sv:
diff --git a/config/routes.rb b/config/routes.rb
index 0ac115b76..56ec559c9 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,39 +2,44 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 Diaspora::Application.routes.draw do
-  resources :people, :only => [:index, :show, :destroy]
-  resources :users, :except => [:create, :new, :show]
-  resources :status_messages
-  resources :comments, :except => [:index]
-  resources :requests, :except => [:edit, :update]
-  resources :photos, :except => [:index]
+  resources :people,          :only   => [:index, :show, :destroy]
+  resources :status_messages, :only   => [:create, :destroy, :show]
+  resources :comments,        :except => [:index]
+  resources :requests,        :except => [:edit, :update]
+  resources :photos,          :except => [:index]
   resources :albums
+  
+  # added public route to user
+  match 'users/:username/public', :to => 'users#public'
+  resources :users,               :except => [:create, :new, :show]
 
   match 'aspects/move_friends', :to => 'aspects#move_friends', :as => 'move_friends'
-  match 'aspects/move_friend', :to => 'aspects#move_friend', :as => 'move_friend'
-  match 'aspects/manage', :to => 'aspects#manage'
-  resources :aspects, :except => [:edit]
+  match 'aspects/move_friend',  :to => 'aspects#move_friend', :as => 'move_friend'
+  match 'aspects/manage',       :to => 'aspects#manage'
+  match 'aspects/public',       :to => 'aspects#public'
+  resources :aspects,           :except => [:edit]
 
+  match 'services/create',    :to   => "services#create"
+  match 'services/destroy',   :to   => "services#destroy"
+  match 'services/fb_post',   :to   => "services#fb_post"
 
-  match 'warzombie',          :to => "dev_utilities#warzombie"
-  match 'zombiefriends',      :to => "dev_utilities#zombiefriends"
-  match 'zombiefriendaccept', :to => "dev_utilities#zombiefriendaccept"
-  match 'set_backer_number', :to => "dev_utilities#set_backer_number"
-  match 'set_profile_photo', :to => "dev_utilities#set_profile_photo"
-
+  match 'warzombie',          :to   => "dev_utilities#warzombie"
+  match 'zombiefriends',      :to   => "dev_utilities#zombiefriends"
+  match 'zombiefriendaccept', :to   => "dev_utilities#zombiefriendaccept"
+  match 'set_backer_number',  :to   => "dev_utilities#set_backer_number"
+  match 'set_profile_photo',  :to   => "dev_utilities#set_profile_photo"
   #routes for devise, not really sure you will need to mess with this in the future, lets put default,
   #non mutable stuff in anohter file
   devise_for :users, :controllers => {:registrations => "registrations"}
   match 'login',  :to => 'devise/sessions#new',      :as => "new_user_session"
   match 'logout', :to => 'devise/sessions#destroy',  :as => "destroy_user_session"
-  match 'signup', :to => 'registrations#new', :as => "new_user_registration"
+  match 'signup', :to => 'registrations#new',        :as => "new_user_registration"
 
-  match 'get_to_the_choppa', :to => redirect("/signup") 
+  match 'get_to_the_choppa', :to => redirect("/signup")
   #public routes
   #
+
   match 'webfinger', :to => 'publics#webfinger'
   match 'hcard/users/:id',    :to => 'publics#hcard'
 
diff --git a/config/selenium.yml b/config/selenium.yml
index 74ce21d73..0d679b602 100644
--- a/config/selenium.yml
+++ b/config/selenium.yml
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 common: &common
   # Try to kill mongrel after suite if tmp/pids/mongrel_selenium.pid exists
   # kill_mongrel_after_suite: true
diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf
index eba9fa45b..188daedcb 100644
--- a/config/sprinkle/conf/nginx.conf
+++ b/config/sprinkle/conf/nginx.conf
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 worker_processes 1;
 pid /tmp/pids/nginx.pid;
 
diff --git a/config/sprinkle/packages/database.rb b/config/sprinkle/packages/database.rb
index 2463007ff..0c1b1ca50 100644
--- a/config/sprinkle/packages/database.rb
+++ b/config/sprinkle/packages/database.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 #package :mongo, :provides => :database do
 #  description 'Mongodb'
 #  version '1.4.3'
diff --git a/config/sprinkle/packages/essential.rb b/config/sprinkle/packages/essential.rb
index fba076e27..8b4349d06 100644
--- a/config/sprinkle/packages/essential.rb
+++ b/config/sprinkle/packages/essential.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 ## Special package, anything that defines a 'source' package means build-essential should be installed for Ubuntu
 
 package :build_essential do
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index 708ab0eeb..947732a79 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 ## Defines available packages
 
 package :ruby do
@@ -43,7 +41,7 @@ package :diaspora_dependencies do
 end
 #package :diaspora do
 #  description 'Diaspora'
-  
+
 =begin
 package :rails do
   description 'Ruby on Rails'
diff --git a/config/sprinkle/packages/scm.rb b/config/sprinkle/packages/scm.rb
index 22ece7d98..981214a60 100644
--- a/config/sprinkle/packages/scm.rb
+++ b/config/sprinkle/packages/scm.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 package :git, :provides => :scm do
   description 'Git Distributed Version Control'
   apt %w( git-core )
diff --git a/config/sprinkle/packages/server.rb b/config/sprinkle/packages/server.rb
index 68e1a12aa..004883dad 100644
--- a/config/sprinkle/packages/server.rb
+++ b/config/sprinkle/packages/server.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 package :nginx, :provides=> :webserver do
   description 'Nginx HTTP server'
   version '0.7.67'
diff --git a/config/sprinkle/packages/unfortunately_essential.rb b/config/sprinkle/packages/unfortunately_essential.rb
index d1504bc43..23975f870 100644
--- a/config/sprinkle/packages/unfortunately_essential.rb
+++ b/config/sprinkle/packages/unfortunately_essential.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 #Fix dreamhost
 #
 
diff --git a/config/sprinkle/provision.rb b/config/sprinkle/provision.rb
index fc81b1ca3..3e30c26f4 100644
--- a/config/sprinkle/provision.rb
+++ b/config/sprinkle/provision.rb
@@ -3,10 +3,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-
-
 require '#{File.dirname(__FILE__)}/packages/essential'
 require '#{File.dirname(__FILE__)}/packages/database'
 require '#{File.dirname(__FILE__)}/packages/server'
@@ -26,7 +22,6 @@ policy :diaspora, :roles => [:pivots] do
   requires :nginx_conf
 end
 
-
 deployment do
 
   # mechanism for deployment
diff --git a/config/thin.yml b/config/thin.yml
index ad91436c1..a49d85ce4 100644
--- a/config/thin.yml
+++ b/config/thin.yml
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 rackup: /usr/local/app/diaspora/current/config.ru
 pid: /tmp/pids/thin.pid
 wait: 30
diff --git a/db/schema.rb b/db/schema.rb
index a4f92eb4b..19e6df260 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file is auto-generated from the current state of the database. Instead of editing this file,
 # please use the migrations feature of Active Record to incrementally modify your database, and
 # then regenerate this schema definition.
diff --git a/db/seeds.rb b/db/seeds.rb
index 29a5191f4..687d2622e 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
@@ -12,5 +10,5 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => citie
 
-require 'config/environment'
+require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 20fe90fdf..c4805eae8 100644
--- a/db/seeds/backer.rb
+++ b/db/seeds/backer.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file should contain all the record creation needed to seed the database with its default values.
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
@@ -12,12 +10,11 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => citie
 
-require 'config/environment'
+require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def create
 
-
-  config = YAML.load_file(File.dirname(__FILE__) + '/../../config/deploy_config.yml')
+  config = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "config", "deploy_config.yml"))
   backer_info = config['servers']['backer']
 
   backer_number = YAML.load_file(Rails.root.join('config','backer_number.yml'))[:seed_number].to_i
@@ -25,7 +22,7 @@ def create
   #set pod url
   username = backer_info[backer_number]['username'].gsub(/ /,'').downcase
   set_app_config username
-  require 'config/initializers/_load_app_config.rb'
+  require File.join(File.dirname(__FILE__), "..", "..", "config", "initializers", "_load_app_config.rb")
 
   # Create seed user
   user = User.instantiate!(:email => "#{username}@#{username}.joindiaspora.com",
@@ -44,8 +41,8 @@ end
 def set_app_config username
   current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
   current_config[Rails.env.to_s] ||= {}
-  current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
-  current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+  current_config[Rails.env.to_s]['pod_url'] = "http://#{username}.joindiaspora.com/"
+  current_config['default']['pod_url'] = "http://#{username}.joindiaspora.com/"
   file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
   file.write(current_config.to_yaml)
   file.close
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index e2d8a5495..f10abec4f 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require 'config/environment'
+require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def set_app_config username
   current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index cc3000d0b..5c418c8db 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -2,15 +2,13 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require 'config/environment'
+require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def set_app_config username
   current_config = YAML.load(File.read(Rails.root.join('config', 'app_config.yml.example')))
   current_config[Rails.env.to_s] ||= {}
-  current_config[Rails.env.to_s]['pod_url'] = "#{username}.joindiaspora.com"
-  current_config['default']['pod_url'] = "#{username}.joindiaspora.com"
+  current_config[Rails.env.to_s]['pod_url'] = "http://#{username}.joindiaspora.com/"
+  current_config['default']['pod_url'] = "http://#{username}.joindiaspora.com/"
   file = File.new(Rails.root.join('..','..','shared','app_config.yml'),'w')
   file.write(current_config.to_yaml)
   file.close
@@ -19,7 +17,6 @@ end
 set_app_config "tom"
 require 'config/initializers/_load_app_config.rb'
 
-
 # Create seed user
 user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
                      :username => "tom",
@@ -47,4 +44,3 @@ reversed_request = user2.accept_friend_request( request.id, user2.aspect(:name =
 user.receive reversed_request.to_diaspora_xml
 user.aspect(:name => "Presidents")
 
-
diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb
new file mode 100644
index 000000000..e3f8bc373
--- /dev/null
+++ b/features/step_definitions/custom_web_steps.rb
@@ -0,0 +1,17 @@
+When /^(.*) in the header$/ do |action|
+  within('header') do
+    When action
+  end
+end
+
+When /^(.*) in the modal window$/ do |action|
+  within('#fancybox-wrap') do
+    When action
+  end
+end
+
+When /^(.*) in the aspect list$/ do |action|
+  within('#aspect_list') do
+    When action
+  end
+end
diff --git a/features/step_definitions/debug_steps.rb b/features/step_definitions/debug_steps.rb
new file mode 100644
index 000000000..c56973edf
--- /dev/null
+++ b/features/step_definitions/debug_steps.rb
@@ -0,0 +1,4 @@
+When 'I debug' do
+  debugger
+  true
+end
diff --git a/features/step_definitions/factory_steps.rb b/features/step_definitions/factory_steps.rb
new file mode 100644
index 000000000..cf1495e99
--- /dev/null
+++ b/features/step_definitions/factory_steps.rb
@@ -0,0 +1,68 @@
+module FactoryMethods
+  def create_from_table(model_name, table, extra = {})
+    factory_name = model_name.gsub(/\W+/, '_').downcase.singularize.to_sym
+    is_singular = model_name.to_s.singularize == model_name.to_s
+    hashes = if is_singular
+               if table.kind_of?(Hash)
+                 [table]
+               else
+                 [table.rows_hash]
+               end
+             else
+               table.hashes
+             end
+    klass = Factory.factories[factory_name].class_name.to_s.classify.constantize
+    @they = hashes.map do |hash|
+      hash = hash.merge(extra).inject({}) do |h,(k,v)|
+        k = k.gsub(/\W+/,'_')
+        v = v.split(/\s*,\s*/) if klass.serialized_attributes[k] == Array
+        h.update(k.to_sym => v)
+      end
+      object = Factory.build(factory_name, hash)
+      yield object if block_given?
+      object.save!
+      object
+    end
+    if is_singular
+      @it = @they.last
+      instance_variable_set("@#{factory_name}", @it)
+    end
+  end
+end
+
+World(FactoryMethods)
+
+Given %r{^I have a (.+)$} do |model_name|
+  create_from_table(model_name, {}, 'user' => @me)
+end
+
+Given %r{^I have the following (.+):$} do |child, table|
+  Given "that me has the following #{child}:", table
+end
+
+Given %r{^the following (.+):$} do |model_name, table|
+  create_from_table(model_name, table)
+end
+
+Given %r{^that (.+) has the following (.+):$} do |parent, child, table|
+  child= child.gsub(/\W+/,'_')
+  parent = parent.gsub(/\W+/,'_').downcase.sub(/^_/, '')
+  parent_instance = instance_variable_get("@#{parent}")
+  parent_class = parent_instance.class
+  if assoc = parent_class.reflect_on_association(child.to_sym) || parent_class.reflect_on_association(child.pluralize.to_sym)
+    parent = (assoc.options[:as] || parent).to_s
+    child = (assoc.options[:class_name] || child).to_s
+  end
+  if child.classify.constantize.method_defined?(parent.pluralize)
+    create_from_table(child, table, parent.pluralize => [parent_instance])
+  elsif child.classify.constantize.method_defined?(parent)
+    create_from_table(child, table, parent => parent_instance)
+  else
+    create_from_table(child, table)
+    if assoc.macro == :has_many
+      parent_instance.send("#{assoc.name}=", @they)
+    else
+      parent_instance.send("#{assoc.name}=", @they.first)
+    end
+  end
+end
diff --git a/features/step_definitions/scope_steps.rb b/features/step_definitions/scope_steps.rb
new file mode 100644
index 000000000..43fe2f48a
--- /dev/null
+++ b/features/step_definitions/scope_steps.rb
@@ -0,0 +1,30 @@
+module SectionLocator
+
+  def within_parent(content, elements = ['*'], &block)
+    expr = %(//*[(#{elements.join('|')})/descendant-or-self::*[contains(., "#{content}")]])
+    within(expr, &block)
+  end
+
+end
+
+World(SectionLocator)
+
+sections = %w(h1 h2 h3 h4 h5 h6 legend caption dt strong header)
+
+When /^(.*) in the "([^\"]*)" section$/ do |action, title|
+  within_parent(title, sections) do
+    When action
+  end
+end
+
+When /^(.*) in the "([^\"]*)" section:$/ do |action, title, table|
+  within_parent(title, sections) do
+    When "#{action}:", table
+  end
+end
+
+When /^(.*) in the "([^\"]*)" row$/ do |action, title|
+  within_parent(title, %w(th td)) do
+    When action
+  end
+end
diff --git a/features/step_definitions/session_steps.rb b/features/step_definitions/session_steps.rb
new file mode 100644
index 000000000..abc9e87df
--- /dev/null
+++ b/features/step_definitions/session_steps.rb
@@ -0,0 +1,26 @@
+Given /^I am signed in as the following (\w+):$/ do |role, table|
+  Given %(the following #{role}:), table
+  @me = @it
+  Given 'I am signed in'
+end
+
+Given /^I (?:am signed|sign) in as an? (\w+)$/ do |role|
+  @me = Factory(role.to_sym)
+  Given 'I am signed in'
+end
+
+
+Given 'I am signed in' do
+  @me ||= Factory(:user)
+  When %(I go to the new user session page)
+  When %(I fill in "Username" with "#{@me.username}")
+  When %(I fill in "Password" with "#{@me.password}")
+  When %(I press "Sign in")
+end
+
+
+When /^I sign in as "([^"]*)"$/ do |email|
+  @me = User.find_by_email(email)
+  @me.password ||= 'password'
+  Given 'I am signed in'
+end
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
new file mode 100644
index 000000000..0f0af8aa2
--- /dev/null
+++ b/features/step_definitions/web_steps.rb
@@ -0,0 +1,219 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
+Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_true
+    else
+      assert field_checked
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_false
+    else
+      assert !field_checked
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
+  
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end
diff --git a/features/support/env.rb b/features/support/env.rb
new file mode 100644
index 000000000..bcb1fdd00
--- /dev/null
+++ b/features/support/env.rb
@@ -0,0 +1,45 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+ENV["RAILS_ENV"] ||= "test"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+require 'cucumber/rails/rspec'
+require 'cucumber/rails/world'
+require 'cucumber/web/tableish'
+
+require 'capybara/rails'
+require 'capybara/cucumber'
+require 'capybara/session'
+require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+# order to ease the transition to Capybara we set the default here. If you'd
+# prefer to use XPath just remove this line and adjust any selectors in your
+# steps to use the XPath syntax.
+Capybara.default_selector = :css
+
+WebMock.disable_net_connect!(:allow_localhost => true)
+
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+#
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
+ActionController::Base.allow_rescue = false
+
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+begin
+ require 'database_cleaner'
+ require 'database_cleaner/cucumber'
+ DatabaseCleaner.strategy = :truncation
+ DatabaseCleaner.orm = "mongo_mapper"
+end
diff --git a/features/support/paths.rb b/features/support/paths.rb
new file mode 100644
index 000000000..3d3f64724
--- /dev/null
+++ b/features/support/paths.rb
@@ -0,0 +1,16 @@
+module NavigationHelpers
+  def path_to(page_name)
+    case page_name
+    when /^its ([\w ]+) page$/
+      send("#{$1.gsub(/\W+/, '_')}_path", @it)
+    when /^the ([\w ]+) page$/
+      send("#{$1.gsub(/\W+/, '_')}_path")
+    when /^"(\/.*)"/
+      $1
+    else
+      raise "Can't find mapping from \"#{page_name}\" to a path."
+    end
+  end
+end
+
+World(NavigationHelpers)
diff --git a/features/user_creates_an_aspect.feature b/features/user_creates_an_aspect.feature
new file mode 100644
index 000000000..fb65fde4c
--- /dev/null
+++ b/features/user_creates_an_aspect.feature
@@ -0,0 +1,23 @@
+@aspects @javascript
+Feature: User creates an aspect
+  In order to share with a limited group
+  As a User
+  I want to create a new aspect
+
+  Background:
+    Given I am signed in
+    And I follow "Manage" in the header
+    And I follow "Add a new aspect"
+
+  Scenario: success
+    Given I fill in "Name" with "Dorm Mates" in the modal window
+    When I press "Create" in the modal window
+    Then I should see "Manage Aspects"
+    And I should see "Dorm Mates" in the header
+    And I should see "Dorm Mates" in the aspect list
+
+  Scenario: I omit the name
+    Given I fill in "Name" with "" in the modal window
+    When I press "Create" in the modal window
+    Then I should see "Manage Aspects"
+    And I should see "Aspect creation failed."
diff --git a/lib/chrome_frame.rb b/lib/chrome_frame.rb
index 10ef3dea3..52a4eb459 100644
--- a/lib/chrome_frame.rb
+++ b/lib/chrome_frame.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Rack
   class ChromeFrame
 
diff --git a/lib/diaspora.rb b/lib/diaspora.rb
index 959d0bb92..e8508b38b 100644
--- a/lib/diaspora.rb
+++ b/lib/diaspora.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
 
   autoload :Parser
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
new file mode 100644
index 000000000..997e538f3
--- /dev/null
+++ b/lib/diaspora/ostatus_builder.rb
@@ -0,0 +1,78 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+module Diaspora
+
+  class Director
+    def initialize
+      @structure = [:create_headers, :create_endpoints, :create_subject,
+                    :create_body, :create_footer]
+    end
+
+    def build(builder)
+      @structure.inject("") do |xml, method|
+        xml << builder.send(method) if builder.respond_to? method
+      end
+    end
+  end
+
+
+  class OstatusBuilder
+    def initialize(user)
+      @user = user
+    end
+
+    def create_headers
+      <<-XML.strip
+      <?xml version="1.0" encoding="UTF-8"?>
+      <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/">
+      <generator uri="http://joindiaspora.com/">Diaspora</generator>
+      <id>#{@user.username}/public</id>
+      <title>Stream</title>
+      <subtitle>its a stream</subtitle>
+      <updated>#{Time.now.xmlschema}</updated>
+      <author>
+        <name>#{@user.real_name}</name>
+        <uri>#{@user.public_url}</uri>
+      </author>
+      XML
+    end
+
+    def create_endpoints
+      <<-XML
+      <link href="#{APP_CONFIG[:pubsub_server]}" rel="hub"/>
+      XML
+    end
+
+    def create_subject
+      <<-XML
+      <activity:subject>
+      <activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+      <id>#{@user.public_url}</id>
+      <title>#{@user.real_name}</title>
+      <link rel="alternative" type="text/html" href="#{@user.public_url}"/>
+      </activity:subject>
+      XML
+    end
+
+    def create_body
+      @user.visible_posts(:public=>true).inject("") do |xml,curr|
+        if curr.respond_to?(:to_activity)
+          unless xml
+            curr.to_activity 
+          else
+            xml + curr.to_activity 
+          end
+        end
+      end
+    end
+
+    def create_footer
+      <<-XML
+      </feed>
+      XML
+    end
+  end
+
+end
diff --git a/lib/diaspora/parser.rb b/lib/diaspora/parser.rb
index 6bc5d4eab..e8e7e8a2b 100644
--- a/lib/diaspora/parser.rb
+++ b/lib/diaspora/parser.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module Parser
     def self.owner_id_from_xml(xml)
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index f3b30f9b3..0f6cc6c5c 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -2,14 +2,12 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module UserModules
     module Friending
       def send_friend_request_to(desired_friend, aspect)
         # should have different exception types for these?
-        raise "You have already sent a friend request to that person!" if self.pending_requests.detect{ 
+        raise "You have already sent a friend request to that person!" if self.pending_requests.detect{
           |x| x.destination_url == desired_friend.receive_url }
         raise "You are already friends with that person!" if self.friends.detect{
           |x| x.receive_url == desired_friend.receive_url}
@@ -29,7 +27,6 @@ module Diaspora
         request
       end
 
-
       def accept_friend_request(friend_request_id, aspect_id)
         request = Request.find_by_id(friend_request_id)
         pending_requests.delete(request)
@@ -89,7 +86,7 @@ module Diaspora
 
       def remove_friend(bad_friend)
         raise "Friend not deleted" unless self.friend_ids.delete( bad_friend.id )
-        aspects.each{|aspect| 
+        aspects.each{|aspect|
           aspect.person_ids.delete( bad_friend.id )}
         self.save
 
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index bd4174c76..7d74df4ed 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module UserModules
     module Querying
@@ -13,12 +11,13 @@ module Diaspora
       end
 
       def visible_posts( opts = {} )
+        opts[:order] ||= 'created_at DESC'
         if opts[:by_members_of]
           return raw_visible_posts if opts[:by_members_of] == :all
           aspect = self.aspects.find_by_id( opts[:by_members_of].id )
           aspect.posts
-        elsif opts[:from]
-          self.raw_visible_posts.find_all_by_person_id(opts[:from].id, :order => 'created_at DESC')
+        else
+          self.raw_visible_posts.all(opts)
         end
       end
 
diff --git a/lib/diaspora/user/receiving.rb b/lib/diaspora/user/receiving.rb
index 39b1af5d2..5d737d8e9 100644
--- a/lib/diaspora/user/receiving.rb
+++ b/lib/diaspora/user/receiving.rb
@@ -43,7 +43,7 @@ module Diaspora
 
       def receive_request request, xml
         person = Diaspora::Parser.parse_or_find_person_from_xml( xml )
-        person.serialized_key ||= request.exported_key
+        person.serialized_public_key ||= request.exported_key
         request.person = person
         request.person.save
         old_request =  Request.first(:id => request.id)
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index 81f7bcfaf..fc241a6d3 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -2,20 +2,14 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module Webhooks
-    def self.included(klass)
-      klass.class_eval do
 
-        def to_diaspora_xml
-          xml = "<XML>"
-          xml += "<post>#{self.to_xml.to_s}</post>"
-          xml += "</XML>"
-        end
-
-       end
+    def to_diaspora_xml
+      xml = "<XML>"
+      xml += "<post>#{to_xml.to_s}</post>"
+      xml += "</XML>"
     end
+
   end
 end
diff --git a/lib/diaspora/websocket.rb b/lib/diaspora/websocket.rb
index 687bd2b7c..10e8bc9c8 100644
--- a/lib/diaspora/websocket.rb
+++ b/lib/diaspora/websocket.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module WebSocket
     def self.queue_to_user(uid, data)
diff --git a/lib/encryptable.rb b/lib/encryptable.rb
index ba36d6ec3..133c05156 100644
--- a/lib/encryptable.rb
+++ b/lib/encryptable.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
   module Encryptable
    def signable_string
      raise NotImplementedException("Override this in your encryptable class")
@@ -17,7 +15,7 @@
       if person.nil?
         Rails.logger.info("Verifying sig on #{signable_string} but no person is here")
         return false
-      elsif person.encryption_key.nil?
+      elsif person.public_key.nil?
         Rails.logger.info("Verifying sig on #{signable_string} but #{person.real_name} has no key")
         return false
       elsif signature.nil?
@@ -25,7 +23,7 @@
         return false
       end
       Rails.logger.debug("Verifying sig on #{signable_string} from person #{person.real_name}")
-      validity = person.encryption_key.verify "SHA", Base64.decode64(signature), signable_string
+      validity = person.public_key.verify "SHA", Base64.decode64(signature), signable_string
       Rails.logger.debug("Validity: #{validity}")
       validity
     end
diff --git a/lib/encryptor.rb b/lib/encryptor.rb
index ed9fbedb1..e9c4936e1 100644
--- a/lib/encryptor.rb
+++ b/lib/encryptor.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Encryptor
   module Public
     def encrypt cleartext
@@ -33,7 +31,7 @@ module Encryptor
     end
 
     def encrypt_aes_key key
-      Base64.encode64 encryption_key.public_encrypt( key.to_json )
+      Base64.encode64 public_key.public_encrypt( key.to_json )
     end
   end
 
@@ -60,6 +58,5 @@ module Encryptor
       txt
     end
 
-
   end
 end
diff --git a/lib/hcard.rb b/lib/hcard.rb
index 7658c5a1d..5640e711b 100644
--- a/lib/hcard.rb
+++ b/lib/hcard.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module HCard
   def self.find url
     doc = Nokogiri::HTML(Net::HTTP.get URI.parse(url))
diff --git a/lib/message_handler.rb b/lib/message_handler.rb
index 0b55ee0f7..e6ce75ffc 100644
--- a/lib/message_handler.rb
+++ b/lib/message_handler.rb
@@ -2,11 +2,8 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 class MessageHandler
 
-
   NUM_TRIES = 3
   TIMEOUT = 5 #seconds
 
diff --git a/lib/mongo_mapper/bson_id.rb b/lib/mongo_mapper/bson_id.rb
index 4de833a66..328c69a03 100644
--- a/lib/mongo_mapper/bson_id.rb
+++ b/lib/mongo_mapper/bson_id.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 class String
   def to_id
     BSON::ObjectId self
diff --git a/lib/mongo_mapper/clear_dev_memory.rb b/lib/mongo_mapper/clear_dev_memory.rb
index 88c7facce..d63084765 100644
--- a/lib/mongo_mapper/clear_dev_memory.rb
+++ b/lib/mongo_mapper/clear_dev_memory.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module MongoMapper
   class ClearDevMemory
     def initialize(app)
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index 931598691..5d2857196 100644
--- a/lib/salmon/salmon.rb
+++ b/lib/salmon/salmon.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # Add URL safe Base64 support
 module Base64
   module_function
@@ -51,8 +49,6 @@ module Salmon
       sig_doc = doc.search('entry')
       slap.magic_sig = MagicSigEnvelope.parse sig_doc
 
-
-
       if  'base64url' == slap.magic_sig.encoding
         slap.data = decode64url(slap.magic_sig.data)
         slap.sig = slap.magic_sig.sig
@@ -98,9 +94,6 @@ ENTRY
       end
     end
 
-
-
-
     # Decode URL-safe-Base64. This implements
     def self.decode64url(str)
       # remove whitespace
@@ -128,7 +121,6 @@ ENTRY
       signature = Base64.urlsafe_decode64(self.magic_sig.sig)
       signed_data = self.magic_sig.signable_string# Base64.urlsafe_decode64(self.magic_sig.signable_string)
 
-
       public_key.verify(OpenSSL::Digest::SHA256.new, signature, signed_data )
     end
 
@@ -194,7 +186,6 @@ ENTRY
       env.encoding  = env.get_encoding
       env.alg = env.get_alg
 
-
       env.sig = Base64.urlsafe_encode64(
         user.encryption_key.sign OpenSSL::Digest::SHA256.new, env.signable_string )
 
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
new file mode 100644
index 000000000..15d405ad4
--- /dev/null
+++ b/lib/tasks/cucumber.rake
@@ -0,0 +1,55 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new(:ok, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new(:wip, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    Cucumber::Rake::Task.new(:rerun, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'rerun'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  Rake.application.instance_variable_get('@tasks').delete('default')
+
+  task :default => [:cucumber, :spec]
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end
diff --git a/lib/tasks/db.rake b/lib/tasks/db.rake
index c0d289cda..396bb145d 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -2,38 +2,36 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 namespace :db do
   desc 'Seed the current RAILS_ENV database from db/seeds.rb'
   namespace :seed do
     task :tom do
       puts "Seeding the database for #{Rails.env}..."
-      require 'db/seeds/tom'
+      require File.dirname(__FILE__) + '/../../db/seeds/tom'
     end
 
     task :dev do
       puts "Seeding the database for #{Rails.env}..."
-      require 'db/seeds/dev'
+      require File.dirname(__FILE__) + '/../../db/seeds/dev'
     end
 
     task :backer do
       puts "Seeding the database for #{Rails.env}..."
-      require 'db/seeds/backer'
+      require File.dirname(__FILE__) + '/../../db/seeds/backer'
       create
     end
-    
+
   end
 
   desc 'Delete the collections in the current RAILS_ENV database'
   task :purge do
-    require 'config/environment'
+    require File.dirname(__FILE__) + '/../../config/environment'
 
     puts "Purging the database for #{Rails.env}..."
 
     # Specifiy what models to remove
     # No!  Drop the fucking database.
-   MongoMapper::connection.drop_database(MongoMapper::database.name) 
+   MongoMapper::connection.drop_database(MongoMapper::database.name)
 
    puts 'Deleting tmp folder...'
    `rm -rf #{File.dirname(__FILE__)}/../../public/uploads/*`
@@ -41,10 +39,10 @@ namespace :db do
 
   desc 'Purge and seed the current RAILS_ENV database using information from db/seeds.rb'
   task :reset do
-    
+
     puts "Resetting the database for #{Rails.env}".upcase
     Rake::Task['db:purge'].invoke
-    Rake::Task['db:seed:tom'].invoke
+    Rake::Task['db:seed:dev'].invoke
     puts "Success!"
   end
 
@@ -54,15 +52,15 @@ namespace :db do
     Rake::Task['db:seed:dev'].invoke
     puts "you did it!"
   end
-  
+
   task :fix_diaspora_handle do
     puts "fixing the people in this seed"
-    require 'config/environment'
+    require File.dirname(__FILE__) + '/../../config/environment'
     Person.where(:url => 'example.org').all.each{|person|
       if person.owner
         person.url = APP_CONFIG[:pod_url]
         person.diaspora_handle = person.owner.diaspora_handle
-        person.save 
+        person.save
       end
     }
     puts "everything should be peachy"
diff --git a/lib/tasks/generate_session_secret.rake b/lib/tasks/generate_session_secret.rake
new file mode 100644
index 000000000..90274dff3
--- /dev/null
+++ b/lib/tasks/generate_session_secret.rake
@@ -0,0 +1,26 @@
+namespace :generate do
+  desc 'Generates a Session Secret Token'
+  task :secret_token do
+
+  path = File.join(Rails.root, 'config', 'initializers', 'secret_token.rb')
+  secret = ActiveSupport::SecureRandom.hex(40)
+  File.open(path, 'w') do |f|
+    f.write <<"EOF"
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Rails.application.config.secret_token = '#{secret}'
+EOF
+
+puts "YAY!!"
+end
+
+  end
+end
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 85ae513f6..54442d71e 100644
--- a/lib/tasks/rspec.rake
+++ b/lib/tasks/rspec.rake
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 begin
   require 'rspec/core'
   require 'rspec/core/rake_task'
@@ -32,13 +30,10 @@ MSG
   end
 end
 
-Rake.application.instance_variable_get('@tasks').delete('default')
-
 spec_prereq = Rails.root.join('config', 'database.yml').exist? ? "db:test:prepare" : :noop
 task :noop do
 end
 
-task :default => :spec
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory (excluding plugin specs)"
diff --git a/lib/tasks/saucelabs_adapter.rake b/lib/tasks/saucelabs_adapter.rake
deleted file mode 100644
index 76f6cbbc4..000000000
--- a/lib/tasks/saucelabs_adapter.rake
+++ /dev/null
@@ -1,59 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-require 'saucelabs_adapter/run_utils'
-
-class Rake::Task
-  def self.exists?(name)
-    tasks.any? { |t| t.name == name }
-  end
-end
-
-namespace :selenium do
-
-  # Rake tasks are cumulative, and some old plugins are still defining selenium:server, so clear it.
-  Rake::Task[:'selenium:server'].clear_actions if Rake::Task.exists?('selenium:server')
-  
-  desc "Run the selenium remote-control server"
-  task :server do
-    system('bundle exec selenium-rc')
-  end
-
-  desc "Run the selenium remote-control server in the background"
-  task :server_bg do
-    system('nohup selenium-rc 2&>1 &')
-  end
-
-  desc "Runs Selenium tests locally (selenium server must already be started)"
-  task :local => [:local_env, :suite]
-
-  desc "Run Selenium tests at saucelabs.com (using configuration 'saucelabs' in config/selenium.yml)"
-  task :sauce => [:sauce_env, :suite]
-
-  desc "Run Selenium tests using configuration SELENIUM_ENV (from config/selenium.yml)"
-  task :custom => [:check_selenium_env_is_set, :suite]
-
-  task :local_env do
-    ENV['SELENIUM_ENV'] = 'local'
-  end
-
-  task :sauce_env do
-    ENV['SELENIUM_ENV'] = 'saucelabs'
-  end
-
-  task :check_selenium_env_is_set do
-    raise "SELENIUM_ENV must be set" unless ENV['SELENIUM_ENV']
-  end
-
-  task :suite do
-    if (File.exists?("test/selenium/selenium_suite.rb"))
-      RunUtils.run "ruby test/selenium/selenium_suite.rb"
-    else
-      puts "test/selenium/selenium_suite.rb not found, bailing.\nPlease create a script that will run your selenium tests."
-      exit 1
-    end
-  end
-end
diff --git a/lib/tasks/whitespace.rake b/lib/tasks/whitespace.rake
index 397674ae5..7af099dd6 100644
--- a/lib/tasks/whitespace.rake
+++ b/lib/tasks/whitespace.rake
@@ -1,10 +1,20 @@
 namespace :whitespace do
   desc 'Removes trailing whitespace'
   task :cleanup do
-    sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
+    sh %{for f in `find . -type f | grep -v -e '.git/' -e 'public/' -e '.png'`;
+          do cat $f | sed 's/[ \t]*$//' > tmp; cp tmp $f; rm tmp; echo -n .;
+        done}
   end
+  desc 'Converts hard-tabs into two-space soft-tabs'
   task :retab do
-    sh %{find . -name '*.rb' -exec sed -i '' 's/\t/  /g' {} \\;}
+    sh %{for f in `find . -type f | grep -v -e '.git/' -e 'public/' -e '.png'`;
+          do cat $f | sed 's/\t/  /g' > tmp; cp tmp $f; rm tmp; echo -n .;
+        done}
+  end
+  desc 'Remove consecutive blank lines'
+  task :scrub_gratuitous_newlines do
+    sh %{for f in `find . -type f | grep -v -e '.git/' -e 'public/' -e '.png'`;
+          do cat $f | sed '/./,/^$/!d' > tmp; cp tmp $f; rm tmp; echo -n .;
+        done}
   end
 end
-
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index 9f9e5803e..cb36d394e 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -5,7 +5,7 @@
 
 function decrementRequestsCounter() {
   var $new_requests = $(".new_requests"),
-      request_html  = $new_requests.html(), 
+      request_html  = $new_requests.html(),
       old_request_count = request_html.match(/\d+/);
 
   if( old_request_count == 1 ) {
@@ -24,11 +24,11 @@ $(function() {
   $("ul .person").draggable({
     revert: true
   });
-  
+
   $("ul .requested_person").draggable({
     revert: true
   });
-  
+
   $(".aspect ul").droppable({
     hoverClass: 'active',
     drop: function(event, ui) {
@@ -72,32 +72,32 @@ $(function() {
       if ($(ui.draggable[0]).hasClass('requested_person')){
         $.ajax({
           type: "DELETE",
-          url: "/requests/" + ui.draggable.attr('request_id'), 
+          url: "/requests/" + ui.draggable.attr('request_id'),
           success: function () {
             decrementRequestsCounter();
           }
         });
-        
+
       } else {
         $.ajax({
           type: "DELETE",
-          url: "/people/" + ui.draggable.attr('id'), 
+          url: "/people/" + ui.draggable.attr('id'),
           success: function () {
             alert("Removed Friend, proably want an undo countdown.")
           }
         });
-        
+
       }
 
-      $(ui.draggable[0]).fadeOut('slow'); // ui.draggable.fadeOut('slow')      
+      $(ui.draggable[0]).fadeOut('slow'); // ui.draggable.fadeOut('slow')
     }
   });
 
 
   $(".aspect h1").live( 'focus', function() {
 
-    var $this = $(this), 
-        id    = $this.closest("li").children("ul").attr("id"), 
+    var $this = $(this),
+        id    = $this.closest("li").children("ul").attr("id"),
         link  = "/aspects/"+ id;
 
     $this.keypress(function(e) {
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index e8db10abd..7811fb1a3 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -21,10 +21,10 @@ $(".show_post_comments").live('click', function(event) {
 
   if( $this.hasClass( "visible")) {
     $this.html($(this).html().replace("hide", "show"));
-    $this.closest("li").children(".content").children(".comments").fadeOut(100);
+    $this.closest("li").children(".content").children(".comments").slideUp(150);
   } else {
     $this.html($(this).html().replace("show", "hide"));
-    $this.closest("li").children(".content").children(".comments").fadeIn(100);
+    $this.closest("li").children(".content").children(".comments").slideDown(150);
   }
   $(this).toggleClass( "visible" );
 });
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index 092d69f16..1509145da 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -5,15 +5,15 @@
 
 
 $(document).ready(function(){
-	
+
 	$('#debug_info').click(function() {
 		$('#debug_more').toggle('fast');
 	});
-	
+
   $("label").inFieldLabels();
-	
+
   $('#flash_notice, #flash_error, #flash_alert').delay(2500).slideUp(130);
-  
+
   $("div.image_cycle").cycle({
     fx: 'fade',
     random: 1,
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1ef65078a..27f5543f1 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -118,6 +118,9 @@ header {
         header #session_action ul li:last-child {
           margin-right: 0; }
   header #aspect_header {
+    -webkit-box-shadow: 0px -4px 6px -2px #777777;
+    background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f7f7f7), to(#eeeeee));
+    background: -moz-linear-gradient(19% 75% 90deg, #eeeeee, #f7f7f7);
     background-color: #eeeeee;
     border-top: 1px solid white;
     padding: 20px 0; }
@@ -143,7 +146,9 @@ ul#stream {
     padding: 12px 0;
     border-bottom: 1px solid #eeeeee; }
     ul#stream > li:hover {
-      background-color: #fafafa; }
+      background: -webkit-gradient(linear, 0% 0%, 0% 50%, from(#fafafa), to(#fcfcfc));
+      background-color: #fafafa;
+      border-bottom: 1px solid #dddddd; }
       ul#stream > li:hover .destroy_link {
         display: inline; }
   ul#stream .right {
@@ -160,7 +165,8 @@ li.message {
   li.message .delete:hover {
     background: #eeeeee; }
   li.message .content {
-    padding-left: 65px; }
+    padding-left: 65px;
+    width: 600px; }
     li.message .content span.from {
       color: black;
       font-weight: normal;
@@ -262,7 +268,7 @@ ul.comment_set {
     margin-bottom: 0.5em;
     background-color: rgba(10, 81, 109, 0.05);
     padding: 0.6em;
-    border-bottom: 1px solid #cccccc; }
+    border-bottom: 1px solid #dddddd; }
     ul.comment_set li.comment .from {
       font-size: 1em; }
     ul.comment_set li.comment div.time {
@@ -387,13 +393,15 @@ label {
     height: 42px;
     margin-top: 0;
     margin-bottom: 0;
-    box-shadow: 0 1px white;
-    -moz-box-shadow: 0 1px white;
-    -webkit-box-shadow: 0 1px white; }
+    box-shadow: 0 1px 2px white;
+    -moz-box-shadow: 0 1px 2px white;
+    -webkit-box-shadow: 0 1px 2px white; }
   #publisher .button {
     margin-left: 100px; }
   #publisher img {
-    -webkit-box-shadow: 0 1px 0 white;
+    box-shadow: 0 1px 2px white;
+    -moz-box-shadow: 0 1px 2px white;
+    -webkit-box-shadow: 0 1px 2px white;
     border: 1px solid #bbbbbb;
       border-top: 1px solid #666666; }
 
@@ -528,10 +536,10 @@ h1.big_text {
         line-height: 18px;
         font-weight: bold;
         background-color: #eeeeee;
-        background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#eeeeee));
-        background: -moz-linear-gradient(19% 75% 90deg, #eeeeee, white);
+        background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(white), to(#f7f7f7));
+        background: -moz-linear-gradient(19% 75% 90deg, #f7f7f7, white);
         border: 1px solid white;
-          border-bottom: 1px solid #eeeeee;
+          border-bottom: 1px solid #f7f7f7;
         color: black; }
         #aspect_nav ul > li.selected a:hover {
           background-color: #efefef; }
@@ -659,15 +667,70 @@ h1.big_text {
         -moz-box-shadow: 0 2px 4px #333333;
         opacity: 0.9; }
 
-#notification_badge {
-  position: fixed;
-  bottom: 0;
-  margin-left: 854px; }
-  #notification_badge a {
-    background-color: #eeeeee;
-    border: 1px solid #cccccc;
-      border-bottom: none;
-    padding: 3px 10px; }
+ul#settings_nav {
+  list-style: none;
+  padding: 0;
+  marign: 0;
+  font-size: larger; }
+  ul#settings_nav > li a {
+    display: block;
+    height: 100%;
+    border-bottom: 1px solid #eeeeee;
+    padding: 5px 0; }
+
+.settings_pane {
+  display: none; }
 
 #fancybox-close:hover {
   background-color: transparent; }
+
+.aspect_tag,
+.public_aspect_tag {
+  position: absolute;
+  top: 15px;
+  right: 2em;
+  border-radius: 5px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  font-size: smaller;
+  padding: 0 6px;
+  color: #999999;
+  text-shadow: 0 1px white;
+  border-bottom: 1px solid #eeeeee;
+  cursor: default; }
+
+.public_aspect_tag {
+  background: -moz-linear-gradient(19% 75% 90deg, #fffa75, #fff8ba);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff8ba), to(#fffa75));
+    background-color: #fffc7f;
+  border-top: 1px solid #ebe66c; }
+
+.aspect_tag {
+  background: -moz-linear-gradient(19% 75% 90deg, #e0e0e0, #f0f0f0);
+  background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#f0f0f0), to(#e0e0e0));
+    background-color: #eeeeee;
+  color: #999999;
+  text-shadow: 0 1px white;
+  border-top: 1px solid #dddddd; }
+  .aspect_tag ul {
+    display: inline;
+    margin: 0;
+    padding: 0;
+    list-style: none; }
+    .aspect_tag ul li {
+      display: inline-block;
+      margin-right: 2px;
+      padding-right: 4px;
+      border-right: 1px solid #cccccc; }
+      .aspect_tag ul li:last-child {
+        margin-right: 0;
+        padding-right: 0;
+        border-right: none; }
+
+#friend_pictures {
+  line-height: 1em; }
+  #friend_pictures img {
+    margin-right: -1px; }
+
+#thumbnails {
+  line-height: 14px; }
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 1291313de..a3873d4c8 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -35,7 +35,7 @@ h1
 
 h3
   :font
-    :size 18px 
+    :size 18px
     :weight bold
 
 .avatar
@@ -54,7 +54,7 @@ h3
   :left 50%
   :text
     :align center
-  :font 
+  :font
     :size 14px
   :padding 3px 0
 
@@ -146,6 +146,11 @@ header
             :right 0
 
   #aspect_header
+    :-webkit-box-shadow 0px -4px 6px -2px #777
+    
+    :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F7F7F7), to(#EEEEEE))
+    :background -moz-linear-gradient(19% 75% 90deg, #eee, #f7f7f7)
+
     :background
       :color #eee
     :border
@@ -182,9 +187,14 @@ ul#stream
       :bottom 1px solid #eee
 
     &:hover
+      :background -webkit-gradient(linear, 0% 0%, 0% 50%, from(#FAFAFA), to(#FCFCFC))
+
       :background
         :color #fafafa
 
+      :border
+        :bottom 1px solid #ddd
+
       .destroy_link
         :display inline
 
@@ -205,10 +215,11 @@ li.message
 
   .delete:hover
     :background #eee
-    
+
   .content
     :padding
       :left 65px
+    :width 600px
 
     span.from
       :color #000
@@ -240,7 +251,7 @@ li.message
     :margin
       :top 5px
     :padding 0
-    
+
     :background
       :color #fafafa
 
@@ -254,7 +265,7 @@ li.message
     :text-shadow 0 2px #fff
     :color #000
 
-    > li 
+    > li
       :font
         :weight bold
 
@@ -285,11 +296,11 @@ form
     :size 120%
   :margin 1em
     :left 0em
-  
+
 #user_name
   :margin
     :bottom 20px
-  
+
   img
     :margin
       :right 10px
@@ -305,7 +316,7 @@ form
       :color #000
 
   span
-    :size small 
+    :size small
     :font
       :weight normal
     :color #999
@@ -321,7 +332,7 @@ form
       :display inline
       :margin
         :right 1em
-    
+
 
 #stream div.comments
   :display none
@@ -336,7 +347,7 @@ input.comment_submit
   :display none
   :margin
     :right -10px
-  
+
 
 ul.comment_set
   :margin 0
@@ -355,12 +366,12 @@ ul.comment_set
       :color rgba(10,81,109,0.05)
     :padding 0.6em
     :border
-      :bottom 1px solid #ccc
+      :bottom 1px solid #ddd
 
     .from
       :font
         :size 1em
-    
+
     div.time
       :color #666
       :font-size 70%
@@ -385,7 +396,7 @@ ul.comment_set
     :list-style-type none
     :margin 0
     :padding 0
-        
+
 
 #stream, #profile,
 .comments
@@ -399,12 +410,12 @@ ul.comment_set
     :float left
     :margin
       :right 10px
-    
+
 
 .pagination
   a
     :padding 3px
-  
+
 .destroy_link, .request_button
   :position absolute
   :right 2em
@@ -496,9 +507,9 @@ label
 
   p
     :position absolute
-    :left 0 
+    :left 0
     :top 0
-  
+
   form
     :display inline
 
@@ -515,18 +526,20 @@ label
       :top 0
       :bottom 0
 
-    :box-shadow 0 1px #fff
-    :-moz-box-shadow 0 1px #fff
-    :-webkit-box-shadow 0 1px #fff
+    :box-shadow 0 1px 2px #fff
+    :-moz-box-shadow 0 1px 2px #fff
+    :-webkit-box-shadow 0 1px 2px #fff
 
   .button
     :margin-left 100px
 
   img
-    :-webkit-box-shadow 0 1px 0 #fff
+    :box-shadow 0 1px 2px #fff
+    :-moz-box-shadow 0 1px 2px #fff
+    :-webkit-box-shadow 0 1px 2px #fff
     :border 1px solid #bbb
       :top 1px solid #666
-    
+
 
 
 #image_picker
@@ -563,13 +576,13 @@ label
 
   .name
     :position absolute
-    :z-index 6 
+    :z-index 6
     :padding 1em
     :background rgba(0,0,0,0.8)
     :bottom 20px
     :font
       :size 18px
-    
+
     :text-shadow 0 2px 0 #000
 
     .time
@@ -586,7 +599,7 @@ label
 .field_with_submit
   input[type='text']
     :width 82%
-    :display inline 
+    :display inline
 
 h1.big_text
   :position relative
@@ -615,7 +628,7 @@ h1.big_text
 
   :margin 0
     :top 25px
-    :bottom 25px 
+    :bottom 25px
 
   :min-height 36px
 
@@ -712,11 +725,11 @@ h1.big_text
         :background
           :color #eee
 
-        :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#eee))
-        :background -moz-linear-gradient(19% 75% 90deg, #eee, #fff)
+        :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#fff), to(#F7F7F7))
+        :background -moz-linear-gradient(19% 75% 90deg, #f7f7f7, #fff)
 
         :border 1px solid #fff
-          :bottom 1px solid #eee
+          :bottom 1px solid #F7F7F7
         :color #000
         &:hover
           :background
@@ -815,7 +828,7 @@ h1.big_text
   .person,
   .requested_person
     :display inline-block
-    :padding 5px 
+    :padding 5px
     :cursor move
     :margin 5px
     :z-index 10
@@ -839,21 +852,102 @@ h1.big_text
         :-moz-box-shadow 0 2px 4px #333
         :opacity 0.9
 
-#notification_badge
-  :position fixed
-  :bottom 0
-  :margin
-    :left 854px
+ul#settings_nav
+  :list
+    :style none
+  :padding 0
+  :marign 0
 
-  a
-    :background
-      :color #eee
+  :font
+    :size larger
 
-    :border 1px solid #ccc
-      :bottom none
+  > li
+
+    a
+      :display block
+      :height 100%
+      :border
+        :bottom 1px solid #eee
+      :padding 5px 0
+
+
+.settings_pane
+  :display none
 
-    :padding 3px 10px
 
 #fancybox-close:hover
   :background
     :color transparent
+
+.aspect_tag,
+.public_aspect_tag
+  :position absolute
+  :top 15px
+  :right 2em
+
+  :border-radius 5px
+  :-webkit-border-radius 5px
+  :-moz-border-radius 5px
+
+  :font
+    :size smaller
+  :padding 0 6px
+
+  :color #999
+  :text
+    :shadow 0 1px #fff
+
+  :border
+    :bottom 1px solid #eee
+
+  :cursor default
+
+.public_aspect_tag
+  :background -moz-linear-gradient(19% 75% 90deg,#FFFA75, #FFF8BA)
+  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#FFF8BA), to(#FFFA75))
+    :color #FFFC7F
+  :border
+    :top 1px solid #EBE66C
+
+.aspect_tag
+  :background -moz-linear-gradient(19% 75% 90deg,#E0E0E0, #F0F0F0)
+  :background -webkit-gradient(linear, 0% 0%, 0% 100%, from(#F0F0F0), to(#E0E0E0))
+    :color #eee
+  :color #999
+  :text
+    :shadow 0 1px #fff
+  :border
+    :top 1px solid #ddd
+
+  ul
+    :display inline
+    :margin 0
+    :padding 0
+    :list
+      :style none
+
+    li
+      :display inline-block
+      :margin
+        :right 2px
+      :padding
+        :right 4px
+      :border
+        :right 1px solid #ccc
+
+      &:last-child
+        :margin
+          :right 0
+        :padding
+          :right 0
+        :border
+          :right none
+
+
+#friend_pictures
+  :line-height 1em
+  img
+    :margin-right -1px
+
+#thumbnails
+  :line-height 14px
diff --git a/public/stylesheets/sass/sessions.sass b/public/stylesheets/sass/sessions.sass
index 326d46b0f..d7cf4644e 100644
--- a/public/stylesheets/sass/sessions.sass
+++ b/public/stylesheets/sass/sessions.sass
@@ -24,7 +24,7 @@
   :left 50%
   :text
     :align center
-  :font 
+  :font
     :size 14px
   :padding 3px 0
 
@@ -135,7 +135,7 @@ input[type='password']
   .username
     :width 200px
     :display inline
-    
+
     input
       :display inline
       :width 200px
diff --git a/script/cucumber b/script/cucumber
new file mode 100755
index 000000000..7fa5c9208
--- /dev/null
+++ b/script/cucumber
@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
+else
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  require 'cucumber'
+  load Cucumber::BINARY
+end
diff --git a/script/rails b/script/rails
index f138a34a4..f8da2cffd 100755
--- a/script/rails
+++ b/script/rails
@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.8
+#!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 APP_PATH = File.expand_path('../../config/application',  __FILE__)
diff --git a/script/ubuntu-setup.bash b/script/ubuntu-setup.bash
new file mode 100755
index 000000000..c335fcf65
--- /dev/null
+++ b/script/ubuntu-setup.bash
@@ -0,0 +1,171 @@
+#!/bin/bash
+# Author : hemanth.hm@gmail.com
+# Site : www.h3manth.com
+# Contributions from: Mackenzie Morgan (maco) and Daniel Thomas (drt24)
+# This script helps to setup diaspora.
+#
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+# USAGE: ./script/ubuntu-setup.bash
+# Do NOT run this script as root.
+
+# Set extented globbing 
+shopt -s extglob
+
+# fail on error
+set -e
+
+[ "$(whoami)" == "root" ] && echo "Please do not run this script as root/sudo
+We need to do some actions as an ordinary user. We use sudo where necessary." && exit 1
+
+# Check if the user has sudo privileges.
+sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; }
+
+# Check if universal repository is enabled 
+grep -i universe /etc/apt/sources.list > /dev/null || \
+    { echo "Please enable universe repository" ; exit 1 ; }
+
+# Make sure that we only install the latest version of packages
+sudo apt-get update
+
+# Check if wget is installed 
+test wget || { echo "Installing wget.." && sudo apt-get install wget \
+    && echo "Installed wget.." ; }
+
+# Install build tools 
+echo "Installing build tools.."
+sudo apt-get -y --no-install-recommends install \
+    build-essential libxslt1.1 libxslt1-dev libxml2
+echo "..Done installing build tools"
+
+# Install Ruby 1.8.7 
+echo "Installing ruby-full Ruby 1.8.7.." 
+sudo apt-get -y --no-install-recommends install ruby-full
+echo "..Done installing Ruby"
+
+# Install Rake 
+echo "Installing rake.."
+sudo apt-get -y  --no-install-recommends install rake
+echo "..Done installing rake"
+
+#Store the release name so we can use it here and later
+RELEASE=$(lsb_release -c | cut -f2)
+
+# Get the current release and install mongodb
+if [ $RELEASE == "maverick" ]
+then
+    #mongodb does not supply a repository for maverick yet so install
+    # an older version from the ubuntu repositories
+    if [ ! -f /usr/lib/libmozjs.so ]
+    then
+        echo "Lanchpad bug https://bugs.launchpad.net/ubuntu/+source/mongodb/+bug/557024
+has not been fixed using workaround:"
+        echo "sudo ln -s /usr/lib/xulrunner-1.9.2.10/libmozjs.so /usr/lib/libmozjs.so"
+        sudo ln -s /usr/lib/xulrunner-1.9.2.10/libmozjs.so /usr/lib/libmozjs.so
+    fi
+
+    sudo apt-get -y  --no-install-recommends install mongodb
+else
+    lsb=$(lsb_release -rs)
+    ver=${lsb//.+(0)/.}
+    repo="deb http://downloads.mongodb.org/distros/ubuntu ${ver} 10gen"
+    echo "Setting up MongoDB.."
+    echo "."
+    echo ${repo} | sudo tee -a /etc/apt/sources.list
+    echo "."
+    echo "Fetching keys.."
+    sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
+    echo "."
+    sudo apt-get  update
+    echo "."
+    sudo apt-get -y  --no-install-recommends install mongodb-stable
+    echo "Done installing monngodb-stable.."
+fi
+
+# Install imagemagick
+echo "Installing imagemagick.."
+sudo apt-get -y --no-install-recommends install imagemagick libmagick9-dev
+echo "Installed imagemagick.."
+
+# Install git-core
+echo "Installing git-core.."
+sudo apt-get -y --no-install-recommends install git-core
+echo "Installed git-core.."
+
+# Setting up ruby gems
+echo "Fetching and installing ruby gems.."
+(
+    if [ $RELEASE == "maverick" ]
+    then
+        sudo apt-get install --no-install-recommends -y rubygems
+        sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+    elif [ $RELEASE == "lucid" ]
+    then
+        sudo add-apt-repository ppa:maco.m/ruby
+        sudo apt-get update
+        sudo apt-get install --no-install-recommends -y rubygems
+        sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH
+    else
+        # Old version
+        echo "."
+        cd /tmp
+        wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
+        echo "."
+        tar -xf rubygems-1.3.7.tgz
+        echo "."
+        cd rubygems-1.3.7
+        echo "."
+        sudo ruby setup.rb
+        echo "."
+        sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+        echo "."
+    fi  
+) 
+echo "Done installing the gems.."
+
+# Install bundler
+echo "Installing bundler.."
+sudo gem install bundler
+echo "Installed bundler.."
+
+# Take a clone of Diaspora
+(
+    # Check if the user is already in a cloned source if not clone the source
+    [[ $( basename $PWD ) == "diaspora" ]]  && \
+        echo "Already in diaspora directory" ||  \
+        { git clone http://github.com/diaspora/diaspora.git && cd diaspora
+              echo "Cloned the source.."
+        }
+
+    # Install extra gems
+    echo "Installing more gems.."
+    bundle install
+    echo "Installed."
+
+    #Configure diaspora
+    cp config/app_config.yml.example config/app_config.yml
+    echo "You need to configure diaspora to tell it which URL it has.
+Opening editor in 5 seconds and then continuing with install."
+    sleep 5
+    #ensure EDITOR is set
+    if [ -z "${EDITOR}"]
+    then
+        EDITOR=vi
+    fi
+    $EDITOR config/app_config.yml
+
+    # Create the shared directory which is used by rake db:seed:tom
+    mkdir shared
+
+    # Install DB setup
+    echo "Seting up DB.."
+    rake db:seed:tom
+    echo "DB ready. Login -> tom and password -> evankorth.
+More details ./diaspora/db/seeds/tom.rb."
+
+    # Run appserver
+    echo "Starting server"
+    bundle exec thin start
+)
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index 67b7d9a78..a8f5f8506 100644
--- a/spec/controllers/albums_controller_spec.rb
+++ b/spec/controllers/albums_controller_spec.rb
@@ -2,9 +2,8 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require 'spec_helper'
 
-require File.dirname(__FILE__) + '/../spec_helper'
-include ApplicationHelper
 describe AlbumsController do
  render_views
   before do
@@ -20,4 +19,14 @@ describe AlbumsController do
     @album.reload.name.should eql("new_name")
   end
 
+  describe '#create' do
+    it 'all aspects' do
+      params = {"album" => {"name" => "Sunsets","to" => "all"}}
+      post :create, params
+    end
+    it 'one aspect' do
+      params = {"album" => {"name" => "Sunsets","to" => @aspect.id.to_s}}
+      post :create, params
+    end
+  end
 end
diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb
index a186e8b7c..2e05b850c 100644
--- a/spec/controllers/aspects_controller_spec.rb
+++ b/spec/controllers/aspects_controller_spec.rb
@@ -2,10 +2,8 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require 'spec_helper'
 
-
-require File.dirname(__FILE__) + '/../spec_helper'
-include ApplicationHelper
 describe AspectsController do
  render_views
   before do
diff --git a/spec/controllers/dev_utilities_controller_spec.rb b/spec/controllers/dev_utilities_controller_spec.rb
new file mode 100644
index 000000000..66c07350f
--- /dev/null
+++ b/spec/controllers/dev_utilities_controller_spec.rb
@@ -0,0 +1,42 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+require File.join(File.dirname(__FILE__), "..", "spec_helper")
+
+describe DevUtilitiesController do
+  render_views
+
+  before do
+    @tom = Factory.create(:user, :email => "tom@tom.joindiaspora.org")
+    sign_in :user, @tom
+  end
+
+  describe "#zombiefriends" do
+    it "succeeds" do
+      get :zombiefriends
+      response.should be_success
+    end
+  end
+
+  describe "#set_profile_photo" do
+    # In case anyone wants their config/backer_number.yml to still exist after running specs
+    before do
+      @backer_number_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml")
+      @temp_file = File.join(File.dirname(__FILE__), "..", "..", "config", "backer_number.yml-tmp")
+      FileUtils.mv(@backer_number_file, @temp_file, :force => true)
+    end
+    after do
+      if File.exists?(@temp_file)
+        FileUtils.mv(@temp_file, @backer_number_file, :force => true)
+      else
+        FileUtils.rm_rf(@backer_number_file)
+      end
+    end
+    it "succeeds" do
+      get :set_backer_number, 'number' => '3'
+      get :set_profile_photo
+      response.should be_success
+    end
+  end
+end
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index badfdf496..4ce6e3e69 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PeopleController do
   render_views
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index bea772e20..70d851a3e 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe PublicsController do
  render_views
diff --git a/spec/controllers/requests_controller_spec.rb b/spec/controllers/requests_controller_spec.rb
deleted file mode 100644
index f0864abe1..000000000
--- a/spec/controllers/requests_controller_spec.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
-include ApplicationHelper
-include RequestsHelper
-describe RequestsController do
- render_views
-  before do
-    @user = Factory.create :user
-    stub_success("tom@tom.joindiaspora.com")
-
-    @tom = Redfinger.finger('tom@tom.joindiaspora.com')
-    sign_in :user, @user
-    stub!(:current_user).and_return @user
-  end
-  it 'should return the correct tag and url for a given address' do
-    relationship_flow('tom@tom.joindiaspora.com')[:friend].receive_url.include?("receive/user").should ==  true
-  end
-end
diff --git a/spec/controllers/sockets_controller_spec.rb b/spec/controllers/sockets_controller_spec.rb
index 799d37500..905b1611e 100644
--- a/spec/controllers/sockets_controller_spec.rb
+++ b/spec/controllers/sockets_controller_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 SocketsController.class_eval <<-EOT
   def url_options
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
new file mode 100644
index 000000000..a050738e1
--- /dev/null
+++ b/spec/controllers/users_controller_spec.rb
@@ -0,0 +1,33 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+require 'spec_helper'
+
+describe UsersController do
+  before do
+    @user = Factory.create(:user)
+    sign_in :user, @user
+    @user.aspect(:name => "lame-os")
+  end
+
+  describe '#update' do
+    context 'with a profile photo set' do
+      before do
+        @user.person.profile.image_url = "http://tom.joindiaspora.com/images/user/tom.jpg"
+        @user.person.profile.save
+      end
+
+      it "doesn't overwrite the profile photo when an empty string is passed in" do
+        image_url = @user.person.profile.image_url
+        put("update", :id => @user.id, "user"=> {"profile"=> 
+          {"image_url"   => "",
+            "last_name"  => @user.person.profile.last_name,
+            "first_name" => @user.person.profile.first_name}})
+        
+        @user.person.profile.image_url.should == image_url
+      end
+
+    end
+  end
+end
diff --git a/spec/factories.rb b/spec/factories.rb
index 21a7ad110..3444cf9e1 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 #For Guidance
 #http://github.com/thoughtbot/factory_girl
 # http://railscasts.com/episodes/158-factories-not-fixtures
@@ -19,7 +17,7 @@ Factory.define :person do |p|
   p.sequence(:url)  {|n| "http://google-#{n}.com/"}
   p.profile Factory.create(:profile)
 
-  p.serialized_key OpenSSL::PKey::RSA.generate(1024).public_key.export
+  p.serialized_public_key OpenSSL::PKey::RSA.generate(1024).public_key.export
 end
 
 Factory.define :album do |p|
@@ -27,22 +25,25 @@ Factory.define :album do |p|
   p.person { |a| Factory.create(:person) }
 end
 
-Factory.define :person_with_private_key, :parent => :person do |p|
-  p.serialized_key OpenSSL::PKey::RSA.generate(1024).export
-end
-
-Factory.define :person_with_user, :parent => :person_with_private_key do |p|
-end
-
 Factory.define :user do |u|
   u.sequence(:username) {|n| "bob#{n}"}
   u.sequence(:email) {|n| "bob#{n}@pivotallabs.com"}
   u.password "bluepin7"
   u.password_confirmation "bluepin7"
-  u.person { |a| Factory.create(:person_with_user,
-                                :owner_id => a._id,
-                                :diaspora_handle => "#{a.username}@#{APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '').chop!}")
-  }
+  u.serialized_private_key  OpenSSL::PKey::RSA.generate(1024).export
+  u.after_build do |user|
+    user.person = Factory(:person, :owner_id => user._id,
+                          :serialized_public_key => user.encryption_key.public_key.export,
+                          :diaspora_handle => "#{user.username}@#{APP_CONFIG[:pod_url].gsub(/(https?:|www\.)\/\//, '').chop!}")
+  end
+end
+
+Factory.define :user_with_aspect, :parent => :user do |u|
+  u.after_build { |user| user.aspects << Factory(:aspect) }
+end
+
+Factory.define :aspect do |aspect|
+  aspect.name "generic"
 end
 
 Factory.define :status_message do |m|
@@ -55,7 +56,6 @@ Factory.define :blog do |b|
   b.sequence(:body) {|n| "jimmy's huge #{n} whales"}
 end
 
-
 Factory.define :bookmark do |b|
   b.link "http://www.yahooligans.com/"
 end
@@ -69,3 +69,11 @@ Factory.define :photo do |p|
 end
 
 Factory.define(:comment) {}
+
+Factory.define :fb_status do |s|
+   s.graph_id "367501354973"
+   s.author_name "Bret Taylor"
+   s.author_id "220439"
+   s.message "Pigs run from our house in fear. Tonight, I am wrapping the pork tenderloin in bacon and putting pancetta in the corn."
+   s.updated_time Time.parse "2010-03-06T02:57:48+0000"
+end
diff --git a/spec/fixtures/evan_hcard b/spec/fixtures/evan_hcard
index d34408759..8944ef1e3 100644
--- a/spec/fixtures/evan_hcard
+++ b/spec/fixtures/evan_hcard
@@ -62,7 +62,7 @@
      <dd id="site_content_license_cc">
       <p>
        <img id="license_cc" src="http://i.creativecommons.org/l/by/3.0/80x15.png" alt="Creative Commons Attribution 3.0" width="80" height="15"/>:w
-       
+
  All Evan Prodromou content and data are available under the <a class="license" rel="external license" href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.</p>
 </dd>
 
diff --git a/spec/fixtures/fb_status b/spec/fixtures/fb_status
new file mode 100644
index 000000000..5602e8343
--- /dev/null
+++ b/spec/fixtures/fb_status
@@ -0,0 +1,79 @@
+{
+   "id": "367501354973",
+   "from": {
+      "name": "Bret Taylor",
+      "id": "220439"
+   },
+   "message": "Pigs run from our house in fear. Tonight, I am wrapping the pork tenderloin in bacon and putting pancetta in the corn.",
+   "updated_time": "2010-03-06T02:57:48+0000",
+   "likes": {
+      "data": [
+         {
+            "id": "29906278",
+            "name": "Ross Miller"
+         }
+      ]
+   },
+   "comments": {
+      "data": [
+         {
+            "id": "367501354973_12216733",
+            "from": {
+               "name": "Doug Edwards",
+               "id": "628675309"
+            },
+            "message": "Make sure you don't, as they say, go whole hog...\nhttp://www.youtube.com/watch?v=U4wTFuaV8VQ",
+            "created_time": "2010-03-06T03:24:46+0000"
+         },
+         {
+            "id": "367501354973_12249673",
+            "from": {
+               "name": "Tom Taylor",
+               "id": "1249191863"
+            },
+            "message": "Are you and Karen gonna, as they say, pig out?",
+            "created_time": "2010-03-06T21:05:21+0000"
+         },
+         {
+            "id": "367501354973_12249857",
+            "from": {
+               "name": "Sheila Taylor",
+               "id": "1315606682"
+            },
+            "message": "how did it turn out?  Sounds nummy!\n",
+            "created_time": "2010-03-06T21:10:30+0000"
+         },
+         {
+            "id": "367501354973_12250973",
+            "from": {
+               "name": "Bret Taylor",
+               "id": "220439"
+            },
+            "message": "Mom: turned out well. Sauce was good as well: pan sauce with mustard, balsamic, onion, and maple syrup. Surprisingly good in the end, and not too sweet, which was my concern. ",
+            "created_time": "2010-03-06T21:44:53+0000"
+         },
+         {
+            "id": "367501354973_12251276",
+            "from": {
+               "name": "Sheila Taylor",
+               "id": "1315606682"
+            },
+            "message": "Sounds delicious!  I probably would have skipped the maple syrup, but I am not married to a Canadian :)\n\nSheila Taylor\n(925) 818-7795\nP.O. Box 938\nGlen Ellen, CA 95442\nwww.winecountrytrekking.com",
+            "created_time": "2010-03-06T21:55:12+0000"
+         },
+         {
+            "id": "367501354973_12264435",
+            "from": {
+               "name": "Amelia Ann Arapoff",
+               "id": "1580390378"
+            },
+            "message": "Bacon is always in our refrigerator, in case of need, somehow there is always need.",
+            "created_time": "2010-03-07T05:11:52+0000"
+         }
+      ],
+      "paging": {
+         "previous": "https://graph.facebook.com/367501354973/comments?access_token=2227470867%7C2.wNlupL2HPsOtrlYFBF56NA__.3600.1285354800-100001548997697%7C8lZ_pdgNDvSHYS4o1OkqhdQu6mA&limit=25&since=2010-03-07T05%3A11%3A52%2B0000",
+         "next": "https://graph.facebook.com/367501354973/comments?access_token=2227470867%7C2.wNlupL2HPsOtrlYFBF56NA__.3600.1285354800-100001548997697%7C8lZ_pdgNDvSHYS4o1OkqhdQu6mA&limit=25&until=2010-03-06T03%3A24%3A45%2B0000"
+      }
+   }
+}
\ No newline at end of file
diff --git a/spec/fixtures/hcard_response b/spec/fixtures/hcard_response
index d87957a93..bbd06c4bf 100644
--- a/spec/fixtures/hcard_response
+++ b/spec/fixtures/hcard_response
@@ -1,44 +1,44 @@
-<div id="content"> 
-  <h1>Alexander Hamiltom</h1> 
-  <div id="content_inner"> 
-    <div id="i" class="entity_profile vcard author"> 
-      <h2>User profile</h2> 
-      <dl class="entity_nickname"> 
-        <dt>Nickname</dt> 
-        <dd> 
-        <a href="http://tom.joindiaspora.com/" rel="me" class="nickname url uid">Alexander Hamiltom</a> 
-        </dd> 
-      </dl> 
-        <dl class="entity_given_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="given_name" >Alexander</span> 
-        </dd> 
+<div id="content">
+  <h1>Alexander Hamiltom</h1>
+  <div id="content_inner">
+    <div id="i" class="entity_profile vcard author">
+      <h2>User profile</h2>
+      <dl class="entity_nickname">
+        <dt>Nickname</dt>
+        <dd>
+        <a href="http://tom.joindiaspora.com/" rel="me" class="nickname url uid">Alexander Hamiltom</a>
+        </dd>
+      </dl>
+        <dl class="entity_given_name">
+        <dt>Full name</dt>
+        <dd>
+        <span class="given_name" >Alexander</span>
+        </dd>
         </dl>
 
-        <dl class="entity_family_name"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="family_name" >Hamiltom</span> 
-        </dd> 
+        <dl class="entity_family_name">
+        <dt>Full name</dt>
+        <dd>
+        <span class="family_name" >Hamiltom</span>
+        </dd>
         </dl>
-        <dl class="entity_fn"> 
-        <dt>Full name</dt> 
-        <dd> 
-        <span class="fn" >Alexander Hamiltom</span> 
-        </dd> 
-      </dl> 
-      <dl class="entity_url"> 
-        <dt>URL</dt> 
-        <dd> 
-        <a href="http://tom.joindiaspora.com/" rel="me" id="pod_location" class="url">http://tom.joindiaspora.com/</a> 
-        </dd> 
-      </dl> 
-      <dl class="entity_note"> 
-        <dt>Note</dt> 
-        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd> 
-      </dl> 
-    </div> 
-  </div> 
+        <dl class="entity_fn">
+        <dt>Full name</dt>
+        <dd>
+        <span class="fn" >Alexander Hamiltom</span>
+        </dd>
+      </dl>
+      <dl class="entity_url">
+        <dt>URL</dt>
+        <dd>
+        <a href="http://tom.joindiaspora.com/" rel="me" id="pod_location" class="url">http://tom.joindiaspora.com/</a>
+        </dd>
+      </dl>
+      <dl class="entity_note">
+        <dt>Note</dt>
+        <dd class="note">Diaspora is awesome! vi is better than emacs!</dd>
+      </dl>
+    </div>
+  </div>
 
-</div> 
+</div>
diff --git a/spec/fixtures/host_xrd b/spec/fixtures/host_xrd
index dcb67d767..8118fa94a 100644
--- a/spec/fixtures/host_xrd
+++ b/spec/fixtures/host_xrd
@@ -1,6 +1,6 @@
   <?xml version='1.0' encoding='UTF-8'?>
   <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0'>
-    <Link rel='lrdd' 
+    <Link rel='lrdd'
           template='http://example.com/webfinger/?q={uri}'>
       <Title>Resource Descriptor</Title>
     </Link>
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 4b89c7b31..459563cff 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -2,18 +2,14 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require 'spec_helper'
 
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-include ApplicationHelper
 describe ApplicationHelper do
   before do
     @user = Factory.create(:user)
     @person = Factory.create(:person)
   end
 
-
   it "should provide a correct show path for a given person" do
     person_url(@person).should == "/people/#{@person.id}"
   end
diff --git a/spec/helpers/publics_helper_spec.rb b/spec/helpers/publics_helper_spec.rb
index 70e9d4606..bc6a5021b 100644
--- a/spec/helpers/publics_helper_spec.rb
+++ b/spec/helpers/publics_helper_spec.rb
@@ -2,11 +2,8 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require 'spec_helper'
 
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-include PublicsHelper
 describe PublicsHelper do
   before do
     @user = Factory.create(:user)
diff --git a/spec/helpers/requests_helper_spec.rb b/spec/helpers/requests_helper_spec.rb
index 2d2be1acb..bf99f89d1 100644
--- a/spec/helpers/requests_helper_spec.rb
+++ b/spec/helpers/requests_helper_spec.rb
@@ -2,16 +2,11 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-include RequestsHelper
+require 'spec_helper'
 
 describe RequestsHelper do
 
   before do
-
     stub_success("tom@tom.joindiaspora.com")
     stub_success("evan@status.net")
     @tom = Redfinger.finger('tom@tom.joindiaspora.com')
@@ -24,4 +19,16 @@ describe RequestsHelper do
       subscription_mode(@evan).should == :none
     end
   end
+
+  describe "#relationship_flow" do
+    let(:tom){ Factory(:user, :email => 'tom@tom.joindiaspora.com') }
+
+    before do
+      stub!(:current_user).and_return(tom)
+    end
+
+    it 'should return the correct tag and url for a given address' do
+      relationship_flow('tom@tom.joindiaspora.com')[:friend].receive_url.should include("receive/user")
+    end
+  end
 end
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index cdd1063ab..530dca211 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -2,20 +2,15 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
-
-include ApplicationHelper
-include Diaspora::Parser
-
-
+require 'spec_helper'
 
 describe Diaspora::Parser do
   before do
     @user = Factory.create(:user, :email => "bob@aol.com")
     @aspect = @user.aspect(:name => 'spies')
-    @person = Factory.create(:person_with_private_key, :diaspora_handle => "bill@gates.com")
+    
+    @user3 = Factory.create :user
+    @person = @user3.person
     @user2 = Factory.create(:user)
   end
 
@@ -71,12 +66,13 @@ describe Diaspora::Parser do
       original_person_id = @person.id
       xml = request.to_diaspora_xml
 
+      @user3.destroy
       @person.destroy
       Person.all.count.should == person_count -1
       @user.receive xml
       Person.all.count.should == person_count
 
-      Person.first(:_id => original_person_id).serialized_key.include?("PUBLIC").should be true
+      Person.first(:_id => original_person_id).serialized_public_key.include?("PUBLIC").should be true
       url = "http://" + request.callback_url.split("/")[2] + "/"
       Person.where(:url => url).first.id.should == original_person_id
     end
@@ -88,14 +84,13 @@ describe Diaspora::Parser do
       original_person_id = @user2.person.id
       xml = request.to_diaspora_xml
 
-
       Person.all.count.should be person_count
       @user.receive xml
       Person.all.count.should be person_count
 
       @user2.reload
       @user2.person.reload
-      @user2.person.serialized_key.include?("PRIVATE").should be true
+      @user2.serialized_private_key.include?("PRIVATE").should be true
 
       url = "http://" + request.callback_url.split("/")[2] + "/"
       Person.where(:url => url).first.id.should == original_person_id
@@ -103,7 +98,7 @@ describe Diaspora::Parser do
 
     it "should activate the Person if I initiated a request to that url" do
       request = @user.send_friend_request_to( @user2.person, @aspect)
-
+      @user.reload
       request.reverse_for @user2
 
       xml = request.to_diaspora_xml
@@ -121,10 +116,10 @@ describe Diaspora::Parser do
       @user.friends.include?(new_person).should be true
     end
 
-
     it 'should process retraction for a person' do
       person_count = Person.all.count
       request = @user.send_friend_request_to( @user2.person, @aspect)
+      @user.reload
       request.reverse_for @user2
       xml = request.to_diaspora_xml
 
@@ -139,7 +134,6 @@ describe Diaspora::Parser do
       aspect_people_count = @aspect.people.size
       #They are now friends
 
-
       Person.count.should == person_count
       @user.receive retraction_xml
 
diff --git a/spec/lib/hcard_spec.rb b/spec/lib/hcard_spec.rb
index 89ad49924..45d7157b9 100644
--- a/spec/lib/hcard_spec.rb
+++ b/spec/lib/hcard_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require File.dirname(__FILE__) + '/../../lib/hcard'
 
 describe HCard do
diff --git a/spec/lib/message_handler_spec.rb b/spec/lib/message_handler_spec.rb
index e6cd668e2..cb0592e9a 100644
--- a/spec/lib/message_handler_spec.rb
+++ b/spec/lib/message_handler_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe MessageHandler do
   before do
@@ -41,8 +39,7 @@ describe MessageHandler do
         }
       end
 
-
-      it 'should only retry a bad request three times ' do
+      it 'should only retry a bad request the correct number of times' do
         request = FakeHttpRequest.new(:failure)
         request.should_receive(:get).exactly(MessageHandler::NUM_TRIES).times.and_return(request)
         EventMachine::HttpRequest.stub!(:new).and_return(request)
@@ -61,7 +58,6 @@ describe MessageHandler do
 
   describe 'POST messages' do
 
-
     it 'should be able to add a post message to the queue' do
       EventMachine.run {
         @handler.size.should ==0
diff --git a/spec/lib/ostatus_builder_spec.rb b/spec/lib/ostatus_builder_spec.rb
new file mode 100644
index 000000000..042bf202b
--- /dev/null
+++ b/spec/lib/ostatus_builder_spec.rb
@@ -0,0 +1,25 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+require 'spec_helper'
+require File.dirname(__FILE__) + '/../../lib/diaspora/ostatus_builder'
+
+describe Diaspora::OstatusBuilder do
+
+  let!(:user) { Factory(:user) }
+  let(:aspect) { user.aspect(:name => "Public People") }
+  let!(:status_message1) { user.post(:status_message, :message => "One", :public => true, :to => aspect.id) }
+  let!(:status_message2) { user.post(:status_message, :message => "Two", :public => true, :to => aspect.id) }
+  let!(:status_message3) { user.post(:status_message, :message => "Three", :public => false, :to => aspect.id) }
+
+  let!(:atom) { director = Diaspora::Director.new; director.build(Diaspora::OstatusBuilder.new(user)) }
+
+  it 'should include a users posts' do
+    atom.should include status_message1.message
+    atom.should include status_message2.message
+    atom.should_not include status_message3.message
+  end
+
+end
+
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index a14ef8f77..6d467d4ea 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/spec/lib/salmon_salmon_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Salmon do
   before do
@@ -23,7 +21,6 @@ describe Salmon do
     @sent_salmon.magic_sig.sig.should == @parsed_salmon.magic_sig.sig
     @sent_salmon.magic_sig.signable_string.should == @parsed_salmon.magic_sig.signable_string
 
-
     @parsed_salmon.verified_for_key?(OpenSSL::PKey::RSA.new(@user.exported_key)).should be true
     @sent_salmon.verified_for_key?(OpenSSL::PKey::RSA.new(@user.exported_key)).should be true
   end
diff --git a/spec/lib/web_hooks_spec.rb b/spec/lib/web_hooks_spec.rb
index d3486f1b5..e316817d4 100644
--- a/spec/lib/web_hooks_spec.rb
+++ b/spec/lib/web_hooks_spec.rb
@@ -2,32 +2,25 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
+require 'spec_helper'
 
+describe Diaspora::Webhooks do
+  before do
+    @user   = Factory.create(:user)
+    @aspect  = @user.aspect(:name => "losers")
+    @user2   = Factory.create(:user)
+    @aspect2  = @user2.aspect(:name => "losers")
+    friend_users(@user, @aspect, @user2, @aspect2)
+  end
 
-require File.dirname(__FILE__) + '/../spec_helper'
-
-include Diaspora
-
-describe Diaspora do
-
-  describe Webhooks do
+  describe "body" do
     before do
-      @user   = Factory.create(:user)
-      @aspect  = @user.aspect(:name => "losers")
-      @user2   = Factory.create(:user)
-      @aspect2  = @user2.aspect(:name => "losers")
-      friend_users(@user, @aspect, @user2, @aspect2)
+      @post = Factory.build(:status_message, :person => @user.person)
     end
 
-    describe "body" do
-      before do
-        @post = Factory.build(:status_message, :person => @user.person)
-      end
-
-      it "should add the following methods to Post on inclusion" do
-        @post.respond_to?(:to_diaspora_xml).should be true
-      end
-
+    it "should add the following methods to Post on inclusion" do
+      @post.respond_to?(:to_diaspora_xml).should be true
     end
+
   end
 end
diff --git a/spec/lib/websocket_spec.rb b/spec/lib/websocket_spec.rb
index edac7051a..0b76e0f52 100644
--- a/spec/lib/websocket_spec.rb
+++ b/spec/lib/websocket_spec.rb
@@ -2,7 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Diaspora::WebSocket do
   before do
diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb
index 14f1d4c3e..c4b2cc67c 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/spec_helper'
+require 'spec_helper'
 
 describe 'making sure the spec runner works' do
 
@@ -34,4 +32,25 @@ describe 'making sure the spec runner works' do
     end
 
   end
+  describe '#friend_users' do
+    before do
+      @user1 = Factory.create(:user)
+      @aspect1 = @user1.aspect(:name => "losers")
+      @user2 = Factory.create(:user)
+      @aspect2 = @user2.aspect(:name => "bruisers")
+      friend_users(@user1, @aspect1, @user2, @aspect2)
+      @user1.reload
+      @aspect1.reload
+      @user2.reload
+      @aspect2.reload
+    end
+
+    it 'makes the first user friends with the second' do
+      @aspect1.people.include?(@user2.person).should be_true
+    end
+
+    it 'makes the second user friends with the first' do
+      @aspect2.people.include?(@user1.person).should be_true
+    end
+  end
 end
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index 5931970cf..23453eee9 100644
--- a/spec/models/aspect_spec.rb
+++ b/spec/models/aspect_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Aspect do
   before do
@@ -20,7 +18,7 @@ describe Aspect do
       aspect.name.should == "losers"
     end
 
-    it 'should be able to have people' do
+    it 'should be creatable with people' do
       aspect = @user.aspect(:name => 'losers', :people => [@friend, @friend_2])
       aspect.people.size.should == 2
     end
@@ -156,16 +154,16 @@ describe Aspect do
       @user.receive message.to_diaspora_xml
       @aspect.reload
 
-      @aspect.posts.count.should be 1
-      @aspect3.posts.count.should be 0
+      @aspect.posts.count.should == 1
+      @aspect3.posts.count.should == 0
 
       @user.reload
       @user.move_friend(:friend_id => @user2.person.id, :from => @aspect.id, :to => @aspect3.id)
       @aspect.reload
       @aspect3.reload
 
-      @aspect3.posts.count.should be 1
-      @aspect.posts.count.should be 0
+      @aspect3.posts.count.should == 1
+      @aspect.posts.count.should == 0
 
     end
 
diff --git a/spec/models/comments_spec.rb b/spec/models/comments_spec.rb
index 1c20354cf..732c4349b 100644
--- a/spec/models/comments_spec.rb
+++ b/spec/models/comments_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Comment do
   describe "user" do
diff --git a/spec/models/fb_status_spec.rb b/spec/models/fb_status_spec.rb
new file mode 100644
index 000000000..368f8bd16
--- /dev/null
+++ b/spec/models/fb_status_spec.rb
@@ -0,0 +1,43 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe FbStatus do
+  
+  let(:fb_status) { Factory.create :fb_status }
+  
+  it 'is valid' do
+    fb_status.should be_valid
+  end
+
+  describe '#from_api' do
+    let!(:json_string) {File.open(File.dirname(__FILE__) + '/../fixtures/fb_status').read}
+    let!(:json_object) { JSON.parse(json_string) }
+    let!(:status_from_json) {FbStatus.from_api(json_object)}
+
+    it 'has graph_id' do
+      status_from_json.graph_id.should == json_object['id']
+    end
+    
+    it 'has author_id' do
+      status_from_json.author_id.should == json_object['from']['id']
+    end
+
+    it 'has author_name' do
+      status_from_json.author_name.should == json_object['from']['name']
+    end
+
+    it 'has message' do
+      status_from_json.message.should == json_object['message']
+    end
+
+    it 'has author_name' do
+      status_from_json.updated_time.should == Time.parse(json_object['updated_time'])
+    end
+  end
+  
+end
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
index 721310409..6df3ddc1c 100644
--- a/spec/models/person_spec.rb
+++ b/spec/models/person_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Person do
   before do
@@ -18,10 +16,10 @@ describe Person do
   describe '#diaspora_handle' do
     context 'local people' do
       it 'uses the pod config url to set the diaspora_handle' do
-        @user.person.diaspora_handle.should == @user.username + "@example.org"
+        @user.person.diaspora_handle.should == @user.username + "@" + APP_CONFIG[:terse_pod_url]
       end
     end
-    
+
     context 'remote people' do
       it 'stores the diaspora_handle in the database' do
         @person.diaspora_handle.include?(APP_CONFIG[:terse_pod_url]).should be false
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 516c16df8..f3f77f3db 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Photo do
   before do
@@ -16,7 +14,6 @@ describe Photo do
     @fixture_name = File.dirname(__FILE__) + '/../fixtures/button.png'
     @fail_fixture_name = File.dirname(__FILE__) + '/../fixtures/msg.xml'
 
-
     @photo = Photo.new(:person => @user.person, :album => @album)
   end
 
@@ -31,8 +28,13 @@ describe Photo do
   it 'should save a photo' do
     @photo.image.store! File.open(@fixture_name)
     @photo.save.should == true
-    binary = @photo.image.read
-    fixture_binary = File.open(@fixture_name).read
+    begin
+      binary = @photo.image.read.force_encoding('BINARY')
+      fixture_binary = File.open(@fixture_name).read.force_encoding('BINARY')
+    rescue NoMethodError # Ruby 1.8 doesn't have force_encoding
+      binary = @photo.image.read
+      fixture_binary = File.open(@fixture_name).read
+    end
     binary.should == fixture_binary
   end
 
diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb
index dc9d4a9b8..b0ed59b7d 100644
--- a/spec/models/post_spec.rb
+++ b/spec/models/post_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Post do
   before do
diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb
index b5bd8f9a5..2e38c20ae 100644
--- a/spec/models/profile_spec.rb
+++ b/spec/models/profile_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Profile do
   before do
@@ -29,4 +27,3 @@ describe Profile do
   end
 
 end
-
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index 5899cb7fb..c8fb8af05 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Request do
   before do
@@ -19,7 +17,7 @@ describe Request do
     person_request.valid?.should be true
   end
 
-  it 'should generate xml for the User as a Person' do 
+  it 'should generate xml for the User as a Person' do
     request = @user.send_friend_request_to Factory.create(:person), @aspect
 
     xml = request.to_xml.to_s
diff --git a/spec/models/retraction_spec.rb b/spec/models/retraction_spec.rb
index 9aa2b8a76..777855234 100644
--- a/spec/models/retraction_spec.rb
+++ b/spec/models/retraction_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Retraction do
     before do
diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb
index 005038bf1..d7dbf19e4 100644
--- a/spec/models/status_message_spec.rb
+++ b/spec/models/status_message_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe StatusMessage do
   before do
@@ -37,6 +35,5 @@ describe StatusMessage do
     end
   end
 
-
 end
 
diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb
index d307e7a43..d86433ad6 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_spec.rb
@@ -2,83 +2,73 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
 
-  let(:user)  { Factory(:user) }
-  let(:user2) { Factory(:user) }
-  let(:user3) { Factory(:user) }
-  let(:user4) { Factory(:user) }
+  let!(:user) { Factory(:user) }
+  let!(:aspect) { user.aspect(:name => 'heroes') }
+  let!(:aspect1) { user.aspect(:name => 'other') }
 
-  let(:aspect)   {user.aspect(:name => 'heroes')}
-  let!(:aspect1) {user.aspect(:name => 'heroes')}
-  let!(:aspect2) {user2.aspect(:name => 'losers')}
-  let!(:aspect3) {user3.aspect(:name => 'heroes')}
-  let!(:aspect4) {user4.aspect(:name => 'heroes')}
+  let!(:user2) { Factory(:user) }
+  let!(:aspect2) { user2.aspect(:name => 'losers') }
 
-  before do
-    friend_users(user, aspect, user2, aspect2)
-    friend_users(user, aspect, user3, aspect3)
-    friend_users(user, aspect1, user4, aspect4)
+  describe '#validate_aspect_permissions' do
+    it 'requires an aspect' do
+      proc {
+        user.validate_aspect_permissions([])
+      }.should raise_error /You must post to someone/
+    end
+
+    it "won't let you post to someone else's aspect" do
+      proc {
+        user.validate_aspect_permissions(aspect2.id)
+      }.should raise_error /Cannot post to an aspect you do not own./
+    end
+
+    it "lets you post to your own aspects" do
+      user.validate_aspect_permissions(aspect.id).should be_true
+      user.validate_aspect_permissions(aspect1.id).should be_true
+    end
   end
 
-  context 'posting' do
-
-    describe '#validate_aspect_permissions' do
-      it 'should not be able to post without a aspect' do
-        proc {
-          user.validate_aspect_permissions([])
-        }.should raise_error /You must post to someone/
-      end
-
-      it 'should not be able to post to someone elses aspect' do
-        proc {
-          user.validate_aspect_permissions(aspect2.id)
-        }.should raise_error /Cannot post to an aspect you do not own./
-      end
+  describe '#post' do
+    it 'should put the post in the aspect post array' do
+      post = user.post(:status_message, :message => "hey", :to => aspect.id)
+      aspect.reload
+      aspect.posts.should include post
     end
 
-    describe '#post' do
-      it 'should put the post in the aspect post array' do
-        post = user.post(:status_message, :message => "hey", :to => aspect.id)
-        aspect.reload
-        aspect.posts.should include post
-      end
-
-      it 'should put an album in the aspect post array' do
-        album = user.post :album, :name => "Georges", :to => aspect.id
-        aspect.reload
-        aspect.posts.should include album
-      end
+    it 'should put an album in the aspect post array' do
+      album = user.post :album, :name => "Georges", :to => aspect.id
+      aspect.reload
+      aspect.posts.should include album
     end
+  end
 
-    describe '#repost' do
-      let!(:status_message) { user.post(:status_message, :message => "hello", :to => aspect.id) }
-
-      it 'should make the post visible in another aspect' do
-        user.repost( status_message, :to => aspect1.id )
-        aspect1.reload
-        aspect1.posts.count.should be 1
-      end
-    end
-
-    describe '#update_post' do
-      let!(:album) { user.post(:album, :name => "Profile Photos", :to => aspect.id) }
-
-      it 'should update fields' do
-        update_hash = { :name => "Other Photos" }
-        user.update_post( album, update_hash )
-        album.name.should == "Other Photos"
-      end
+  describe '#update_post' do
+    it 'should update fields' do
+      album = user.post(:album, :name => "Profile Photos", :to => aspect.id)
+      update_hash = {:name => "Other Photos"}
+      user.update_post(album, update_hash)
+      album.name.should == "Other Photos"
     end
   end
 
   context 'dispatching' do
+    let!(:user3) { Factory(:user) }
+    let!(:aspect3) { user3.aspect(:name => 'heroes') }
+    let!(:user4) { Factory(:user) }
+    let!(:aspect4) { user4.aspect(:name => 'heroes') }
+
     let!(:post) { user.build_post :status_message, :message => "hey" }
 
+    before do
+      friend_users(user, aspect, user2, aspect2)
+      friend_users(user, aspect, user3, aspect3)
+      friend_users(user, aspect1, user4, aspect4)
+    end
+
     describe '#push_to_aspects' do
       it 'should push a post to a aspect' do
         user.should_receive(:salmon).twice
diff --git a/spec/models/user/receive_spec.rb b/spec/models/user/receive_spec.rb
index 37648a98c..5bdddce67 100644
--- a/spec/models/user/receive_spec.rb
+++ b/spec/models/user/receive_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
 
diff --git a/spec/models/user/user_friending_spec.rb b/spec/models/user/user_friending_spec.rb
index 67ed9f799..4ea51ad19 100644
--- a/spec/models/user/user_friending_spec.rb
+++ b/spec/models/user/user_friending_spec.rb
@@ -2,9 +2,7 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
    before do
@@ -24,7 +22,6 @@ describe User do
       aspect.requests.size.should == 1
     end
 
-
      it "should be able to accept a pending friend request" do
       friend = Factory.create(:person)
       r = Request.instantiate(:to => @user.receive_url, :from => friend)
@@ -53,12 +50,9 @@ describe User do
       @user.friends << friend
       @user.save
 
-
       proc {@user.send_friend_request_to( friend, @aspect)}.should raise_error
     end
 
-
-
     describe 'multiple users accepting/rejecting the same person' do
       before do
         @person_one = Factory.create :person
@@ -144,7 +138,6 @@ describe User do
         Person.all.count.should be 3
       end
 
-
     end
 
     describe 'a user accepting rejecting multiple people' do
@@ -231,6 +224,5 @@ describe User do
     end
   end
 
-
   end
 end
diff --git a/spec/models/user/visible_posts_spec.rb b/spec/models/user/visible_posts_spec.rb
index bcab473bc..040fcd1bc 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_spec.rb
@@ -2,46 +2,63 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe User do
-  let(:user) { Factory(:user) }
+  let!(:user) { Factory(:user_with_aspect) }
+  let!(:first_aspect) { user.aspects.first }
+  let!(:second_aspect) { user.aspect(:name => 'losers') }
 
-  let(:user2) { Factory(:user) }
-  let(:user3) { Factory(:user) }
-  let(:user4) { Factory(:user) }
+  let!(:user2) { Factory(:user_with_aspect) }
 
-  let!(:aspect)  { user.aspect(:name => 'heroes') }
-  let!(:aspect2) { user.aspect(:name => 'losers') }
+  let!(:status_message1) { user2.post :status_message, :message => "hi", :to => user2.aspects.first.id }
+  let!(:status_message2) { user2.post :status_message, :message => "hey", :public => true , :to => user2.aspects.first.id }
+  let!(:status_message3) { user2.post :status_message, :message => "va", :to => user2.aspects.first.id }
+  let!(:status_message4) { user2.post :status_message, :message => "da", :public => true , :to => user2.aspects.first.id }
 
-  let!(:user2_aspect) { user2.aspect(:name => 'dudes') }
-  let!(:user3_aspect) { user3.aspect(:name => 'dudes') }
-  let!(:user4_aspect) { user4.aspect(:name => 'dudes') }
-
-  let(:status_message1) { user2.post :status_message, :message => "hi", :to => user2_aspect.id }
-  let(:status_message2) { user3.post :status_message, :message => "heyyyy", :to => user3_aspect.id }
-  let(:status_message3) { user4.post :status_message, :message => "yooo", :to => user4_aspect.id }
 
   before do
-    friend_users(user, aspect, user2, user2_aspect)
-    friend_users(user, aspect2, user3, user3_aspect)
-    friend_users(user, aspect2, user4, user4_aspect)
+    friend_users(user, first_aspect, user2, user2.aspects.first)
   end
 
-  it 'should generate a valid stream for a aspect of people' do
-    (1..3).each{ |n|
-      eval("user.receive status_message#{n}.to_diaspora_xml")
-    }
+  describe "#visible_posts" do
+    it "queries by person id" do
+      user2.visible_posts(:person_id => user2.person.id).include?(status_message1).should == true
+      user2.visible_posts(:person_id => user2.person.id).include?(status_message2).should == true
+      user2.visible_posts(:person_id => user2.person.id).include?(status_message3).should == true
+      user2.visible_posts(:person_id => user2.person.id).include?(status_message4).should == true
+    end
 
-    user.visible_posts(:by_members_of => aspect).should include status_message1
-    user.visible_posts(:by_members_of => aspect).should_not include status_message2
-    user.visible_posts(:by_members_of => aspect).should_not include status_message3
+    it "selects public posts" do
+      user2.visible_posts(:public => true).include?(status_message2).should == true
+      user2.visible_posts(:public => true).include?(status_message4).should == true
+    end
 
-    user.visible_posts(:by_members_of => aspect2).should_not include status_message1
-    user.visible_posts(:by_members_of => aspect2).should include status_message2
-    user.visible_posts(:by_members_of => aspect2).should include status_message3
+    it "selects non public posts" do
+      user2.visible_posts(:public => false).include?(status_message1).should == true
+      user2.visible_posts(:public => false).include?(status_message3).should == true
+    end
+
+    it "selects by message contents" do
+      user2.visible_posts(:message => "hi").include?(status_message1).should == true
+    end
+
+    it "queries by aspect" do
+      user3 = Factory(:user_with_aspect)
+      status_message2 = user3.post :status_message, :message => "heyyyy", :to => user3.aspects.first.id
+      user4 = Factory(:user_with_aspect)
+      status_message3 = user4.post :status_message, :message => "yooo", :to => user4.aspects.first.id
+
+      friend_users(user, second_aspect, user3, user3.aspects.first)
+      friend_users(user, second_aspect, user4, user4.aspects.first)
+
+      user.receive status_message1.to_diaspora_xml
+      user.receive status_message2.to_diaspora_xml
+      user.receive status_message3.to_diaspora_xml
+
+      user.visible_posts(:by_members_of => first_aspect).should =~ [status_message1]
+      user.visible_posts(:by_members_of => second_aspect).should =~ [status_message2, status_message3]
+    end
   end
 
   context 'querying' do
@@ -55,21 +72,10 @@ describe User do
 
   context 'albums' do
 
-
     before do
-      @album = user.post :album, :name => "Georges", :to => aspect.id
-      aspect.reload
-      aspect2.reload
-      user.reload
-
-      @album2 = user.post :album, :name => "Borges", :to => aspect.id
-      aspect.reload
-      aspect2.reload
-      user.reload
-
-      user.post :album, :name => "Luises", :to => aspect2.id
-      aspect.reload
-      aspect2.reload
+      user.post :album, :name => "Georges", :to => first_aspect.id
+      user.post :album, :name => "Borges", :to => first_aspect.id
+      user.post :album, :name => "Luises", :to => second_aspect.id
       user.reload
     end
 
@@ -78,8 +84,8 @@ describe User do
     end
 
     it 'should return the right number of albums' do
-      user.albums_by_aspect(aspect).should have(2).albums
-      user.albums_by_aspect(aspect2).should have(1).album
+      user.albums_by_aspect(first_aspect.reload).should have(2).albums
+      user.albums_by_aspect(second_aspect.reload).should have(1).album
     end
   end
 end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1608bbe58..7d072bdd5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -2,15 +2,20 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe User do
   let(:user)   { Factory(:user) }
-  let(:aspect) { user.aspect(:name => 'heroes') }
 
-  describe '#diaspora_handle' do 
+  describe "validations" do
+    it "downcases the username" do
+      user = Factory.build(:user, :username => "ALLUPPERCASE")
+      user.valid?
+      user.username.should == "alluppercase"
+    end
+  end
+
+  describe '#diaspora_handle' do
     it 'uses the pod config url to set the diaspora_handle' do
       user.diaspora_handle.should == user.username + "@example.org"
     end
@@ -29,6 +34,7 @@ describe User do
   end
 
   context 'aspects' do
+    let(:aspect) { user.aspect(:name => 'heroes') }
     let(:user2)   { Factory(:user) }
     let(:aspect2) { user2.aspect(:name => 'stuff') }
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3fdac9810..4149200d8 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 
@@ -16,8 +14,6 @@ require 'webmock/rspec'
 include Devise::TestHelpers
 include WebMock
 
-
-
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
@@ -45,6 +41,9 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 end
+
+ImageUploader.enable_processing = false
+
   def stub_sockets
     Diaspora::WebSocket.stub!(:queue_to_user).and_return(true)
     Diaspora::WebSocket.stub!(:subscribe).and_return(true)
@@ -82,7 +81,12 @@ end
   def friend_users(user1, aspect1, user2, aspect2)
     request = user1.send_friend_request_to(user2.person, aspect1)
     reversed_request = user2.accept_friend_request( request.id, aspect2.id)
+    user1.reload
     user1.receive reversed_request.to_diaspora_xml
+    user1.reload
+    aspect1.reload
+    user2.reload
+    aspect2.reload
   end
 
   def stub_success(address = 'abc@example.com')
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 33b86d52c..2188b106e 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -2,27 +2,16 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
-require File.dirname(__FILE__) + '/spec_helper'
-include ApplicationHelper
-include Diaspora::Parser
+require 'spec_helper'
 
 describe 'user encryption' do
   before do
     unstub_mocha_stubs
     @user = Factory.create(:user)
     @aspect = @user.aspect(:name => 'dudes')
-    @person = Factory.create(:person_with_private_key,
-      :profile => Profile.new(:first_name => 'Remote',
-                              :last_name => 'Friend'),
-      :diaspora_handle => 'somewhere@else.com',
-      :url => 'http://distant-example.com/')
-    @person2 = Factory.create(:person_with_private_key,
-      :profile => Profile.new(:first_name => 'Second',
-                              :last_name => 'Friend'),
-      :diaspora_handle => 'elsewhere@else.com',
-      :url => 'http://distanter-example.com/')
+    
+    @user2 = Factory.create(:user)
+    @aspect2 = @user2.aspect(:name => 'dudes')
   end
 
   after  do
@@ -78,7 +67,10 @@ describe 'user encryption' do
 
   describe 'comments' do
     before do
-      @remote_message = Factory.create(:status_message, :person => @person)
+      friend_users(@user, @aspect, @user2, @aspect2)
+      @remote_message = @user2.post :status_message, :message => "hello", :to => @aspect2.id
+
+
       @message = @user.post :status_message, :message => "hi", :to => @aspect.id
     end
     it 'should attach the creator signature if the user is commenting' do
@@ -94,24 +86,24 @@ describe 'user encryption' do
     end
 
     it 'should verify a comment made on a remote post by a different friend' do
-      comment = Comment.new(:person => @person2, :text => "balls", :post => @remote_message)
-      comment.creator_signature = comment.send(:sign_with_key,@person2.encryption_key)
+      comment = Comment.new(:person => @user2.person, :text => "cats", :post => @remote_message)
+      comment.creator_signature = comment.send(:sign_with_key,@user2.encryption_key)
       comment.signature_valid?.should be true
       comment.verify_post_creator_signature.should be false
-      comment.post_creator_signature = comment.send(:sign_with_key,@person.encryption_key)
+      comment.post_creator_signature = comment.send(:sign_with_key,@user.encryption_key)
       comment.verify_post_creator_signature.should be true
     end
 
     it 'should reject comments on a remote post with only a creator sig' do
-      comment = Comment.new(:person => @person2, :text => "balls", :post => @remote_message)
-      comment.creator_signature = comment.send(:sign_with_key,@person2.encryption_key)
+      comment = Comment.new(:person => @user2.person, :text => "cats", :post => @remote_message)
+      comment.creator_signature = comment.send(:sign_with_key,@user2.encryption_key)
       comment.signature_valid?.should be true
       comment.verify_post_creator_signature.should be false
     end
 
     it 'should receive remote comments on a user post with a creator sig' do
-      comment = Comment.new(:person => @person2, :text => "balls", :post => @message)
-      comment.creator_signature = comment.send(:sign_with_key,@person2.encryption_key)
+      comment = Comment.new(:person => @user2.person, :text => "cats", :post => @message)
+      comment.creator_signature = comment.send(:sign_with_key,@user2.encryption_key)
       comment.signature_valid?.should be true
       comment.verify_post_creator_signature.should be false
     end
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
deleted file mode 100644
index 74e8c9421..000000000
--- a/test/performance/browsing_test.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-require 'test_helper'
-require 'rails/performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionDispatch::PerformanceTest
-  def test_homepage
-    get '/'
-  end
-end
diff --git a/test/selenium/login_test.rb b/test/selenium/login_test.rb
deleted file mode 100644
index 321d46e1d..000000000
--- a/test/selenium/login_test.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-class SampleWebratTest < ActionController::IntegrationTest
-
-  def test_widget
-    visit "/"
-    assert_contain "sign in"
-  end
-end
diff --git a/test/selenium/selenium_suite.rb b/test/selenium/selenium_suite.rb
deleted file mode 100644
index d5362b1d7..000000000
--- a/test/selenium/selenium_suite.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'test_helper'))
-require 'test/unit/ui/console/testrunner'
-require 'webrat'
-require 'saucelabs_adapter'
-
-Webrat.configure do |config|
-  config.mode = :selenium
-  config.application_framework = :rack
-end
-
-require File.join(File.dirname(__FILE__), 'sample_webrat_test')
diff --git a/test/test_helper.rb b/test/test_helper.rb
deleted file mode 100644
index d9742c116..000000000
--- a/test/test_helper.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-#   Copyright (c) 2010, Diaspora Inc.  This file is
-#   licensed under the Affero General Public License version 3.  See
-#   the COPYRIGHT file.
-
-
-
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../config/environment', __FILE__)
-require 'rails/test_help'
-
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
-  #fixtures :all
-
-  # Add more helper methods to be used by all tests here...
-end
diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
deleted file mode 100644
index 67b602abe..000000000
--- a/ubuntu-setup.bash
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-# Author : hemanth.hm@gmail.com
-# Site : www.h3manth.com
-# This script helps to setup diaspora.
-#
-
-# Set extented globbing 
-shopt -s extglob
-
-# Check if the user has sudo privileges.
-[[ $( id -u) ]] && echo "$(whoami) has no sudo permissions on this machine" && exit 1
-
-# Install build tools 
-echo "Installing build tools.."
-sudo apt-get -y --no-install-recommends install build-essential libxslt1.1 libxslt1-dev libxml2
-echo "..Done installing build tools"
-
-# Install Ruby 1.8.7 
-echo "Installing ruby-full Ruby 1.8.7.." 
-sudo apt-get -y --no-install-recommends install ruby-full
-echo "..Done installing Ruby"
-
-# Install Rake 
-echo "Installing rake.."
-sudo apt-get -y  --no-install-recommends install rake
-echo "..Done installing rake"
-
-# Get the current release and install mongodb
-lsb=$(lsb_release -rs)
-ver=${lsb//.+(0)/.}
-repo="deb http://downloads.mongodb.org/distros/ubuntu ${ver} 10gen"
-echo "Setting up MongoDB.."
-echo "."
-echo ${repo} | sudo tee -a /etc/apt/sources.list
-echo "."
-echo "Fetching keys.."
-sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10
-echo "."
-sudo apt-get  update
-echo "."
-sudo apt-get -y  --no-install-recommends install mongodb-stable
-echo "Done installing monngodb-stable.."
-
-# Install imagemagick
-echo "Installing imagemagick.."
-sudo apt-get -y --no-install-recommends install imagemagick libmagick9-dev
-echo "Installed imagemagick.."
-
-# Install git-core
-echo "Installing git-core.."
-sudo apt-get -y --no-install-recommends install git-core
-echo "Installed git-core.."
-
-# Setting up ruby gems
-echo "Fetching and installing ruby gems.."
-(
-    echo "."
-    cd /tmp 
-    wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
-    echo "."
-    tar -xf rubygems-1.3.7.tgz
-    echo "."
-    cd rubygems-1.3.7
-    echo "."
-    sudo ruby setup.rb
-    echo "."
-    sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
-    echo "."    
-) 
-echo "Done installing the gems.."
-
-# Install blunder
-echo "Installing blunder.."
-sudo gem install bundler
-echo "Installed blunder.."
-
-# Take a clone of Diaspora
-(
-echo "Clone diaspora source.."
-git clone http://github.com/diaspora/diaspora.git
-echo "Cloned the source.."
-# Install extra gems 
-cd diaspora
-echo "Installing more gems.."
-sudo bundle install
-echo "Installed."
-
-# Install DB setup 
-echo "Seting up DB.."
-rake db:seed:tom
-echo "DB ready. Login -> tom and password -> evankorth. More details ./diaspora/db/seeds/tom.rb."
-
-# Run appserver 
-echo "Starting server"
-bundle exec thin start 
-)