From 6ffc03a4c92fed1d533921269ab503d2d10ab45f Mon Sep 17 00:00:00 2001
From: Dorian <pr.dorian@gmail.com>
Date: Sat, 25 Sep 2010 12:35:20 +0200
Subject: [PATCH] Big clean up: delete trailing whitespace

---
 COPYRIGHT                                     |  6 +-
 app/controllers/aspects_controller.rb         |  2 +-
 app/models/person.rb                          |  6 +-
 app/models/user.rb                            | 10 +--
 app/views/albums/_album.html.haml             |  2 +-
 app/views/aspects/index.html.haml             |  2 +-
 app/views/aspects/manage.html.haml            |  8 +-
 app/views/comments/_comment.html.haml         |  2 +-
 app/views/comments/_comments.html.haml        |  2 +-
 app/views/devise/sessions/new.html.haml       |  4 +-
 app/views/js/_websocket_js.haml               | 20 ++---
 app/views/layouts/application.html.haml       | 10 +--
 app/views/layouts/session_wall.html.haml      | 10 +--
 app/views/people/index.html.haml              |  2 +-
 app/views/people/new.html.haml                |  4 +-
 app/views/people/show.html.haml               |  2 +-
 app/views/photos/_new_photo.haml              |  6 +-
 app/views/photos/_photo.haml                  |  4 +-
 app/views/photos/show.html.haml               |  2 +-
 app/views/posts/_post.html.haml               |  4 +-
 app/views/publics/hcard.erb                   | 80 +++++++++----------
 app/views/publics/host_meta.erb               |  4 +-
 app/views/requests/_new_request.haml          |  2 +-
 app/views/shared/_aspect_friends.haml         |  6 +-
 app/views/shared/_publisher.haml              |  2 +-
 app/views/shared/_reshare.haml                |  2 +-
 .../status_messages/_status_message.html.haml |  8 +-
 app/views/status_messages/index.html.haml     |  2 +-
 app/views/users/edit.html.haml                |  2 +-
 config/app_config.yml.example                 |  2 +-
 config/environments/production.rb             |  2 +-
 config/initializers/_load_app_config.rb       |  2 +-
 config/locales/devise/devise.cy.yml           | 72 ++++++++---------
 config/locales/devise/devise.fi.yml           |  2 +-
 config/locales/devise/devise.sv.yml           |  2 +-
 config/locales/diaspora/cy.yml                |  2 +-
 config/locales/diaspora/de.yml                |  6 +-
 config/locales/diaspora/en.yml                |  2 +-
 config/locales/diaspora/es.yml                |  6 +-
 config/locales/diaspora/fr-informal.yml       |  2 +-
 config/locales/diaspora/fr.yml                |  2 +-
 config/locales/diaspora/it.yml                |  2 +-
 config/locales/diaspora/ro.yml                |  2 +-
 config/locales/diaspora/ru.yml                |  2 +-
 config/locales/diaspora/sv.yml                |  2 +-
 config/routes.rb                              |  2 +-
 config/sprinkle/packages/ruby.rb              |  2 +-
 lib/diaspora/user/friending.rb                |  4 +-
 lib/tasks/db.rake                             | 10 +--
 public/javascripts/aspect-edit.js             | 20 ++---
 public/javascripts/view.js                    |  8 +-
 public/stylesheets/sass/application.sass      | 44 +++++-----
 public/stylesheets/sass/sessions.sass         |  4 +-
 spec/fixtures/evan_hcard                      |  2 +-
 spec/fixtures/hcard_response                  | 80 +++++++++----------
 spec/fixtures/host_xrd                        |  2 +-
 spec/misc_spec.rb                             |  2 +-
 spec/models/request_spec.rb                   |  2 +-
 spec/models/user_spec.rb                      |  2 +-
 ubuntu-setup.bash                             | 36 ++++-----
 60 files changed, 273 insertions(+), 273 deletions(-)

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/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 9b0b5faa3..80e4c7d0d 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -33,7 +33,7 @@ class AspectsController < ApplicationController
     begin
       current_user.drop_aspect @aspect
       flash[:notice] = i18n.t 'aspects.destroy.success',:name => @aspect.name
-    rescue RuntimeError => e 
+    rescue RuntimeError => e
       flash[:error] = e.message
     end
 
diff --git a/app/models/person.rb b/app/models/person.rb
index 38a55db2b..9527a7bb7 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -78,7 +78,7 @@ class Person
   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
@@ -100,9 +100,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/user.rb b/app/models/user.rb
index ade7b7a2a..6f74fa8de 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -66,7 +66,7 @@ class User
   def drop_aspect( aspect )
     if aspect.people.size == 0
       aspect.destroy
-    else 
+    else
       raise "Aspect not empty"
     end
   end
@@ -106,11 +106,11 @@ 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 
+    post
   end
 
   def repost( post, options = {} )
@@ -137,9 +137,9 @@ class User
     end
 
     aspect_ids.each do |aspect_id|
-      unless 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
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/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 47a68ffeb..11275b6b4 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -5,7 +5,7 @@
 
 - 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..043ce3308 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -3,7 +3,7 @@
 -#   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'
 
@@ -34,7 +34,7 @@
 %ul#aspect_list
   - for aspect in @aspects
     %li.aspect
-      
+
       .aspect_name
         %span.edit_name_field
           %h1{:contenteditable => true}= aspect.name
@@ -44,9 +44,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/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 4fd46eb56..2c233f1dc 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -3,7 +3,7 @@
 -#   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..87e1c1db1 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -9,4 +9,4 @@
       = render 'comments/comment', :post => comment
     %li.comment.show
       = render 'comments/new_comment', :post => post
-	 	
+
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..45a358652 100644
--- a/app/views/js/_websocket_js.haml
+++ b/app/views/js/_websocket_js.haml
@@ -19,18 +19,18 @@
 
       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);
@@ -66,7 +66,7 @@
         $(html).fadeIn("fast", function(){
           $("#stream label:first").inFieldLabels();
         })
-      ); 
+      );
     }
   }
 
@@ -77,13 +77,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 +100,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..71976017c 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,24 +10,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..5611fd479 100644
--- a/app/views/layouts/session_wall.html.haml
+++ b/app/views/layouts/session_wall.html.haml
@@ -10,7 +10,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 +18,10 @@
 
     :javascript
       $(document).ready(function(){
-        $("#user_username").focus(); 
+        $("#user_username").focus();
         $("label").inFieldLabels();
       });
-  
+
     = csrf_meta_tag
     = yield(:head)
 
@@ -44,11 +44,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..c8425551d 100644
--- a/app/views/people/index.html.haml
+++ b/app/views/people/index.html.haml
@@ -21,5 +21,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..2b635e997 100644
--- a/app/views/people/new.html.haml
+++ b/app/views/people/new.html.haml
@@ -15,13 +15,13 @@
     = 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
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index 23e6ea64d..3fc80cfd7 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -28,7 +28,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..7c3e7e76e 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -4,14 +4,14 @@
 
 
 :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..9fadad187 100644
--- a/app/views/photos/_photo.haml
+++ b/app/views/photos/_photo.haml
@@ -17,9 +17,9 @@
       %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
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 21ce72181..08eba0c29 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -53,4 +53,4 @@
   %h4{:class => "show_post_comments"}
     = "#{t('.comments')} (#{@photo.comments.count})"
   = render "comments/comments", :post => @photo
-    
+
diff --git a/app/views/posts/_post.html.haml b/app/views/posts/_post.html.haml
index 217441465..5b4493286 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -4,6 +4,6 @@
 
 
 %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/requests/_new_request.haml b/app/views/requests/_new_request.haml
index 70c204e7c..f47e47371 100644
--- a/app/views/requests/_new_request.haml
+++ b/app/views/requests/_new_request.haml
@@ -10,7 +10,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..e27bb3fdb 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -10,11 +10,11 @@
 
   -unless @aspect == :all
     = 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/_publisher.haml b/app/views/shared/_publisher.haml
index 040d3e3c2..e163a3ba0 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -18,5 +18,5 @@
         %li
           = check_box_tag("aspect_ids[]", aspect.id, @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..1861c7d27 100644
--- a/app/views/shared/_reshare.haml
+++ b/app/views/shared/_reshare.haml
@@ -19,7 +19,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/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 4d73f4251..f136a4c33 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -9,17 +9,17 @@
 
   .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
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index c2a579d87..42ed5fc09 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -6,7 +6,7 @@
 %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/users/edit.html.haml b/app/views/users/edit.html.haml
index 25668776f..46e966f54 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -49,7 +49,7 @@
       = p.label :first_name
       = p.text_field :first_name, :value => @profile.first_name
     %p
-      = p.label :last_name 
+      = p.label :last_name
       = p.text_field :last_name, :value => @profile.last_name
 
   #submit_block
diff --git a/config/app_config.yml.example b/config/app_config.yml.example
index 75568dd11..b2251fefc 100644
--- a/config/app_config.yml.example
+++ b/config/app_config.yml.example
@@ -13,7 +13,7 @@ default:
   pubsub_server: 'https://pubsubhubbub.appspot.com/'
   mongo_host: 'localhost'
   mongo_port: 27017
-  
+
 development:
 
 test:
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 358e6e092..cb13c1d1c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -15,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/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/locales/devise/devise.cy.yml b/config/locales/devise/devise.cy.yml
index 5d6d6049a..2d09ac956 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -1,42 +1,42 @@
 #   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.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.sv.yml b/config/locales/devise/devise.sv.yml
index b434666ce..3c41ea81b 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.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.
- 		
+
 
 sv:
   errors:
diff --git a/config/locales/diaspora/cy.yml b/config/locales/diaspora/cy.yml
index b7d9c9af4..e0198b1b6 100644
--- a/config/locales/diaspora/cy.yml
+++ b/config/locales/diaspora/cy.yml
@@ -30,7 +30,7 @@ cy:
       new_album:
           create: "creu"
           add_a_new_album: "Ychwanegu albwm newydd"
-      show: 
+      show:
           edit_album: "Golygu Albwm"
           albums: "albymau"
           updated: "diweddarwyd"
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index ae8fb13e3..9c7d67f4d 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -45,7 +45,7 @@ de:
       new_album:
           create: "erstellen"
           add_a_new_album: "Album hinzufügen"
-      show: 
+      show:
           edit_album: "Album bearbeiten"
           albums: "Alben"
           updated: "aktualisiert"
@@ -98,7 +98,7 @@ de:
           notice: "Du zeigst deinem Freund jetzt einen anderen Aspekt von dir."
       helper:
           remove: "entfernen"
-          aspect_not_empty: "Aspekt ist nicht leer"          
+          aspect_not_empty: "Aspekt ist nicht leer"
   users:
       edit:
           cancel: "Abbrechen"
@@ -132,7 +132,7 @@ de:
           delete_photo: "Foto löschen"
       photo:
           show_comments: "Kommentare anzeigen"
-          posted_a_new_photo_to: "neues Foto veröffentlicht bei"          
+          posted_a_new_photo_to: "neues Foto veröffentlicht bei"
       new:
           new_photo: "Foto erstellen"
           back_to_list: "Zurück zur Liste"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index a6a98c7cd..9db808746 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -45,7 +45,7 @@ en:
       new_album:
           create: "create"
           add_a_new_album: "Add a new album"
-      show: 
+      show:
           edit_album: "Edit Album"
           albums: "albums"
           updated: "updated"
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 5af6c70aa..1f6b6b2e7 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.yml
@@ -45,7 +45,7 @@ es:
       new_album:
           create: "Crear"
           add_a_new_album: "Añade un nuevo álbum"
-      show: 
+      show:
           edit_album: "Editar Álbum"
           albums: "álbumes"
           updated: "actualizar"
@@ -167,7 +167,7 @@ es:
           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"
@@ -178,7 +178,7 @@ es:
           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"          
+          you_have_a_friend_request_from_this_person: "you have a friend request from this person"
       show:
           last_seen: "ultima vez visto: %{how_long_ago}"
           friends_since: "amigos desde: %{how_long_ago}"
diff --git a/config/locales/diaspora/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index f70812fdf..2342ff1ce 100644
--- a/config/locales/diaspora/fr-informal.yml
+++ b/config/locales/diaspora/fr-informal.yml
@@ -45,7 +45,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"
diff --git a/config/locales/diaspora/fr.yml b/config/locales/diaspora/fr.yml
index 6d77dcf00..8a44e6dac 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"
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index 418733b40..bb44c6f27 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -45,7 +45,7 @@ it:
       new_album:
           create: "crea"
           add_a_new_album: "Aggiungi un nuovo album"
-      show: 
+      show:
           edit_album: "Modifica album"
           albums: "album"
           updated: "aggiornato"
diff --git a/config/locales/diaspora/ro.yml b/config/locales/diaspora/ro.yml
index c99bd2a85..5800f4a30 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"
diff --git a/config/locales/diaspora/ru.yml b/config/locales/diaspora/ru.yml
index d0d9e8039..1b5d3b958 100644
--- a/config/locales/diaspora/ru.yml
+++ b/config/locales/diaspora/ru.yml
@@ -30,7 +30,7 @@ ru:
       new_album:
           create: "создать"
           add_a_new_album: "Добавить новый альбом"
-      show: 
+      show:
           edit_album: "Редактировать альбом"
           albums: "альбомы"
           updated: "обновленные"
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index 1caf878b8..dfb8deb7f 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -3,7 +3,7 @@
 #   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 7f60bd63b..c2a38dbc6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,7 +29,7 @@ Diaspora::Application.routes.draw do
   match 'logout', :to => 'devise/sessions#destroy',  :as => "destroy_user_session"
   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'
diff --git a/config/sprinkle/packages/ruby.rb b/config/sprinkle/packages/ruby.rb
index 261cf3ffe..947732a79 100644
--- a/config/sprinkle/packages/ruby.rb
+++ b/config/sprinkle/packages/ruby.rb
@@ -41,7 +41,7 @@ package :diaspora_dependencies do
 end
 #package :diaspora do
 #  description 'Diaspora'
-  
+
 =begin
 package :rails do
   description 'Ruby on Rails'
diff --git a/lib/diaspora/user/friending.rb b/lib/diaspora/user/friending.rb
index 35695c546..0f6cc6c5c 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -7,7 +7,7 @@ module Diaspora
     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}
@@ -86,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/tasks/db.rake b/lib/tasks/db.rake
index 9c438ddb1..4b6202f29 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -22,7 +22,7 @@ namespace :db do
       require File.dirname(__FILE__) + '/../../db/seeds/backer'
       create
     end
-    
+
   end
 
   desc 'Delete the collections in the current RAILS_ENV database'
@@ -33,7 +33,7 @@ namespace :db do
 
     # 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,7 +41,7 @@ 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
@@ -54,7 +54,7 @@ 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 File.dirname(__FILE__) + '/../../config/environment'
@@ -62,7 +62,7 @@ namespace :db do
       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/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/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/sass/application.sass b/public/stylesheets/sass/application.sass
index 1291313de..e9f9b2188 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
 
@@ -205,7 +205,7 @@ li.message
 
   .delete:hover
     :background #eee
-    
+
   .content
     :padding
       :left 65px
@@ -240,7 +240,7 @@ li.message
     :margin
       :top 5px
     :padding 0
-    
+
     :background
       :color #fafafa
 
@@ -254,7 +254,7 @@ li.message
     :text-shadow 0 2px #fff
     :color #000
 
-    > li 
+    > li
       :font
         :weight bold
 
@@ -285,11 +285,11 @@ form
     :size 120%
   :margin 1em
     :left 0em
-  
+
 #user_name
   :margin
     :bottom 20px
-  
+
   img
     :margin
       :right 10px
@@ -305,7 +305,7 @@ form
       :color #000
 
   span
-    :size small 
+    :size small
     :font
       :weight normal
     :color #999
@@ -321,7 +321,7 @@ form
       :display inline
       :margin
         :right 1em
-    
+
 
 #stream div.comments
   :display none
@@ -336,7 +336,7 @@ input.comment_submit
   :display none
   :margin
     :right -10px
-  
+
 
 ul.comment_set
   :margin 0
@@ -360,7 +360,7 @@ ul.comment_set
     .from
       :font
         :size 1em
-    
+
     div.time
       :color #666
       :font-size 70%
@@ -385,7 +385,7 @@ ul.comment_set
     :list-style-type none
     :margin 0
     :padding 0
-        
+
 
 #stream, #profile,
 .comments
@@ -399,12 +399,12 @@ ul.comment_set
     :float left
     :margin
       :right 10px
-    
+
 
 .pagination
   a
     :padding 3px
-  
+
 .destroy_link, .request_button
   :position absolute
   :right 2em
@@ -496,9 +496,9 @@ label
 
   p
     :position absolute
-    :left 0 
+    :left 0
     :top 0
-  
+
   form
     :display inline
 
@@ -526,7 +526,7 @@ label
     :-webkit-box-shadow 0 1px 0 #fff
     :border 1px solid #bbb
       :top 1px solid #666
-    
+
 
 
 #image_picker
@@ -563,13 +563,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 +586,7 @@ label
 .field_with_submit
   input[type='text']
     :width 82%
-    :display inline 
+    :display inline
 
 h1.big_text
   :position relative
@@ -615,7 +615,7 @@ h1.big_text
 
   :margin 0
     :top 25px
-    :bottom 25px 
+    :bottom 25px
 
   :min-height 36px
 
@@ -815,7 +815,7 @@ h1.big_text
   .person,
   .requested_person
     :display inline-block
-    :padding 5px 
+    :padding 5px
     :cursor move
     :margin 5px
     :z-index 10
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/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/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/misc_spec.rb b/spec/misc_spec.rb
index 65cb9da60..c4b2cc67c 100644
--- a/spec/misc_spec.rb
+++ b/spec/misc_spec.rb
@@ -44,7 +44,7 @@ describe 'making sure the spec runner works' do
       @user2.reload
       @aspect2.reload
     end
-    
+
     it 'makes the first user friends with the second' do
       @aspect1.people.include?(@user2.person).should be_true
     end
diff --git a/spec/models/request_spec.rb b/spec/models/request_spec.rb
index 4e1380df1..c8fb8af05 100644
--- a/spec/models/request_spec.rb
+++ b/spec/models/request_spec.rb
@@ -17,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/user_spec.rb b/spec/models/user_spec.rb
index ad7070eaa..a2e964dfd 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -8,7 +8,7 @@ describe User do
   let(:user)   { Factory(:user) }
   let(:aspect) { user.aspect(:name => 'heroes') }
 
-  describe '#diaspora_handle' do 
+  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
diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index 08c839f33..117a78ed9 100755
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -9,29 +9,29 @@
 #   the COPYRIGHT file.
 
 
-# Set extented globbing 
+# Set extented globbing
 shopt -s extglob
 
 # 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 
+# Check if universal repository is enabled
 grep -i universe /etc/apt/sources.list > /dev/null || { echo "Please enable universe repository" ; exit 1 ; }
 
-# Check if wget is installed 
+# Check if wget is installed
 test wget || echo "Installing wget.." && sudo apt-get install wget && echo "Installed wget.."
 
-# Install build tools 
+# 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.." 
+# 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 
+# Install Rake
 echo "Installing rake.."
 sudo apt-get -y  --no-install-recommends install rake
 echo "..Done installing rake"
@@ -79,7 +79,7 @@ echo "Fetching and installing ruby gems.."
 	else
 		# Old version
 		echo "."
-		cd /tmp 
+		cd /tmp
 		wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz
 		echo "."
 		tar -xf rubygems-1.3.7.tgz
@@ -88,10 +88,10 @@ echo "Fetching and installing ruby gems.."
 		echo "."
 		sudo ruby setup.rb
 		echo "."
-		sudo ln -s /usr/bin/gem1.8 /usr/bin/gem 
-		echo "."    
-    fi  
-) 
+		sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
+		echo "."
+    fi
+)
 echo "Done installing the gems.."
 
 # Install bundler
@@ -102,22 +102,22 @@ 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 
+# 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 
+# Install extra gems
 cd diaspora
 echo "Installing more gems.."
 sudo bundle install
 echo "Installed."
 
-# Install DB setup 
+# 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 
+# Run appserver
 echo "Starting server"
-bundle exec thin start 
+bundle exec thin start
 )