diff --git a/Capfile b/Capfile
index af77f235a5711b661e66a9b8ee36ff2bf3a47124..306a9d64b4d13679a3e274e38b23d7d616826fcb 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 419f75094d591007890d4a15cf495d76c9d5f23b..7fde201c14d2dbfda380903433800f7b7e4e3544 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,6 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0'
 gem 'bundler', '1.0.0'
 
-
 #Security
 gem 'devise', :git => 'http://github.com/BadMinus/devise.git'
 
diff --git a/README.md b/README.md
index 97ec6683489e1b32680275271c167cdca8c6852d..c8f193afede1d4f39be4456b38dcebd62a4369b7 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,6 @@ 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 f00478e2e23daf3d405ab9b480f3b9259dd3acaf..fa9be254a924b609d6ece3081039651634812374 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,8 +2,6 @@
 #   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.
 
diff --git a/app/views/albums/_new_album.haml b/app/views/albums/_new_album.haml
index daefe15f3cf655dfa0d7149e6cd361fb56f74141..e0212a6b4566c7218960cba9698e549ee8503e20 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 4dfb2294caa3f27f5ef3dc520517a0e3088663a9..67cc3071d6355ae51b772f0922bc30f63a3d5939 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 af83b53ebbb54a9bd4e09dadb1ddbdf514cf202f..2e680c1102137f34748420281fcd91532e31a8f0 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 7b5e6c8be16b8bf292051d040d770aea58aa5252..4c9ba19b861e1643943cee031ae79ec3db7c357f 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 9f0b662dd85e6aec01acbc7a7c9b31a79871bb84..548abd0d1a91ae6f7e084866fe3e51c8548f05e4 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 11275b6b49b6128f294b6d305efb4274e761e645..ae24e8e3b72750d347db1a1aff74b20df681e34e 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -2,11 +2,9 @@
 -#   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 043ce3308b62be7b5bbd0a2615999ef1c4d742f1..e08f6dabdbc2de5308f4853a0d36744789d9b133 100644
--- a/app/views/aspects/manage.html.haml
+++ b/app/views/aspects/manage.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :head do
   = javascript_include_tag 'jquery-ui-1.8.4.custom.min.js'
   = javascript_include_tag 'aspect-edit.js'
@@ -29,8 +28,6 @@
 - 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
diff --git a/app/views/aspects/show.html.haml b/app/views/aspects/show.html.haml
index d4262f838ccda14e2ca5dca8a82a6553fa06505a..ae24e8e3b72750d347db1a1aff74b20df681e34e 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 2c233f1dca9c75bb8becdf7244fd95cdf7f1ce40..03a2fcf61fd13fed1463304c753130984b5576ba 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %li.comment{:id => post.id}
   = person_image_tag(post.person)
   %span.from
diff --git a/app/views/comments/_comments.html.haml b/app/views/comments/_comments.html.haml
index 87e1c1db19a88007a519291f14e3ec9c3c3e4849..aecfb4bf17bf8ac64948d4b99980e7115d2d7e3b 100644
--- a/app/views/comments/_comments.html.haml
+++ b/app/views/comments/_comments.html.haml
@@ -2,7 +2,6 @@
 -#   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
diff --git a/app/views/comments/_new_comment.html.haml b/app/views/comments/_new_comment.html.haml
index a4268082d8844d4aacfe532ba0bbcb49e5dbba90..99c03f8986ed13d8150f0f5e2ca1a3402820ec58 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/js/_websocket_js.haml b/app/views/js/_websocket_js.haml
index 45a35865221581952f27494ff6806ac67e5b8e6f..4677f6ce677f67b42529f413b367617022f2e3c2 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";
@@ -29,7 +28,6 @@
         processPost(obj['class'], obj['html'], obj['aspect_ids'])
       }
 
-
     };
     ws.onclose = function() { debug("socket closed"); };
     ws.onopen = function() {
@@ -37,7 +35,6 @@
       debug("connected...");
     };
 
-
   });
   function processRetraction(post_id){
     $('#' + post_id ).fadeOut(500, function(){
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 71976017c41873c966571d1171c62946409e0ea3..fc063e0b6acf3c9f5a229fdb69d9e9a0b27b203c 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
diff --git a/app/views/layouts/session_wall.html.haml b/app/views/layouts/session_wall.html.haml
index 5611fd47970d68e19bf9fabd798f2b767585c4a8..29b863b32de2bd9027d3092211a41c4e6f84af3f 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
diff --git a/app/views/people/index.html.haml b/app/views/people/index.html.haml
index c8425551d2b2b82755b0e4d50979d3569410da23..5981569b82fa577f7fa739da78d8b6d7e26c2399 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
diff --git a/app/views/people/new.html.haml b/app/views/people/new.html.haml
index 2b635e99745a7e530229ceae6a5add8a438217eb..0584732bc0776a5aae297d6db44602111bdce093 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|
@@ -28,5 +27,4 @@
         = 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 3fc80cfd73d1f3b3ba17d3391e2071f9edb69c5a..9b5128160e678078e31015389bc60a808f80b5b4 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
 
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index 7c3e7e76e3345bcff21d0d9c81291327bc4ed025..d1a4fc73f576560c7977181884024da1d60dfc60 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 :javascript
   function createUploader(){
     var uploader = new qq.FileUploader({
diff --git a/app/views/photos/_photo.haml b/app/views/photos/_photo.haml
index 9fadad1870c56e0cdcd6c194ab44bcb4cd84d2af..d39fd0666d7f2cd1fa839b9f460bd6120fe71d80 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)
diff --git a/app/views/photos/edit.html.haml b/app/views/photos/edit.html.haml
index bbaee2ef8467be0a04f790609fe771893eb4f333..06556039cc862511b00fbead532de680cdd64149 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)
diff --git a/app/views/photos/new.html.haml b/app/views/photos/new.html.haml
index 1fdf71a8451743168eede304294a02b8507c0d60..d8701c265157ac65e65290b868991d483a97b081 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 08eba0c291a2298357ce5d6b9b54f6a3050090ad..787f5861dfc85029c8d4682e9272b2fb10d7546d 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
diff --git a/app/views/posts/_debug.haml b/app/views/posts/_debug.haml
index 17d7baad8340a204dc116c6fce51c8f4db476bf9..ef1984d7d7e7a296548112804198d193452d550e 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 5b44932868e9cead3ae66ee9d0d36a3e8e70bbbf..acad2e12be4789fddfc83f5239f3c4b1635f213f 100644
--- a/app/views/posts/_post.html.haml
+++ b/app/views/posts/_post.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 %ul
   %h3= link_to post.class, object_path(post)
   - for field in object_fields(post)
diff --git a/app/views/registrations/new.html.haml b/app/views/registrations/new.html.haml
index f837c92de2db94090b87ae17e12fd48027bfec4c..25902720e9b637cb5a54b352a405b43411a9bcf1 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 f47e473712bf52c3006b472eb25dda12d3de92d8..0dbf5b0a129189a6f6f735fc58941d611419f1b0 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
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index e27bb3fdbaa5021523db54819285b468f0b2f0af..b4927edc6b2f2650b4dd7f3f1783d2ee63607967 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/app/views/shared/_aspect_friends.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #friend_pictures
   = owner_image_link
   - for friend in @friends
diff --git a/app/views/shared/_aspect_nav.haml b/app/views/shared/_aspect_nav.haml
index 8e900e42d6b35e35cf86288001691c6706049c8f..a0a0ee0ad9ca240cd24ffdc9090e4fd30957d642 100644
--- a/app/views/shared/_aspect_nav.haml
+++ b/app/views/shared/_aspect_nav.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 #aspect_nav
   %ul
     - for aspect in @aspects
diff --git a/app/views/shared/_post_wrapper.haml b/app/views/shared/_post_wrapper.haml
index b901fc60858b210cf26c30c1e347e7262d52871e..956706b683c7a650d94ff81a4436bf7bbd20ef0b 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 e163a3ba0257ef94ce35056cb5adc0f6cd73d52e..1a440b838b093f2f11d838a998995e52c9b0df50 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
 
diff --git a/app/views/shared/_reshare.haml b/app/views/shared/_reshare.haml
index 1861c7d2770e903f4250dd5ef96d1608a0108186..9df1c9ce19d6f1fda94df07a630edcab5b1ab224 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();
diff --git a/app/views/shared/log.haml b/app/views/shared/log.haml
index 7472689e3f55b4db37c118f438fbd8a2e1e2cbe3..bf957bf7ce2dfc64e26d6458d4e46cb11d62cc69 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 b515dadffaf37e1eb4c04e011c39103c7a6274f3..c27585f0a572dfe2c3e58efbef5952b9e89d2d62 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 f136a4c33cd5ff476c78cbfff9cf7c1be41cb94f..55c5123b7f4f4a2a4b547fd7ef87a9a1432631ab 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.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)
diff --git a/app/views/status_messages/index.html.haml b/app/views/status_messages/index.html.haml
index 42ed5fc09ba7f899df1b594e9d9ebcb473a5a9c2..43c065380a86ee32ef62d10d8c540cc94e58346c 100644
--- a/app/views/status_messages/index.html.haml
+++ b/app/views/status_messages/index.html.haml
@@ -2,7 +2,6 @@
 -#   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
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 46e966f541a370857b77896810711c79e417e712..3385cb5eae0572a829ac97891c57eccb732d58f3 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3.  See
 -#   the COPYRIGHT file.
 
-
 - content_for :publish do
   %h1="#{t('.editing_profile')}"
 
diff --git a/config.ru b/config.ru
index cb12bcfa2b582da1931c875cbd4b49f98cd9857d..0c65f5908bfbdbd3f73fc23baf15883a19c8b7f4 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 b2251fefc71df691950177b2d40dad18b254aa23..069823a05c8c1075ce7a546f9f2ff0be1142a1b4 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
diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 9bd7a6b963929a0498828740cc83f01d6cb7e9ae..6aacbf3fff11f287b6162f1ce5313de3f7820f10 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/locales/devise/devise.cs.yml b/config/locales/devise/devise.cs.yml
index 34d9eb7c1ef51ccb18143325d6e06f2b0dd9a30a..26ff8044db7b2e66f8e679029a632dba2a931a89 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 2d09ac9566af7b41d15b6933360fd2019ae771b8..d8b6d94f49e75d2e28291272fed0ad3a750ea095 100644
--- a/config/locales/devise/devise.cy.yml
+++ b/config/locales/devise/devise.cy.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 cy:
   errors:
     messages:
diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml
index 82b658e99362f04b2db262871e81e5820bc1616a..e6608c18191dec3c3ebe7269d7041f01c0543350 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:
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index 8876bc5bffd6daa247141c995263778fb22f6d04..7ab686bd4e9843ff0aecfe8e9106d1d2ebaefafe 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.fr-informal.yml b/config/locales/devise/devise.fr-informal.yml
index 9578af9d9a3d1c6156ed3ea0b3f5af38d7c23f6a..6fe14382e3ee17de7d2ede8805e9f65eb4d71824 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 b8691eb3a3291e7e9279374edec0ea9eb78d622d..240e9d967d21b049aae335cf8b4e428df1ff238f 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
index 851a907895ff53db230506d5a2e82f5e247ac1aa..4ae726a4d7de4bb3b34f3ff7649745c5cf1c8379 100644
--- a/config/locales/devise/devise.he.yml
+++ b/config/locales/devise/devise.he.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.it.yml b/config/locales/devise/devise.it.yml
index 76f761e377e5d9ec302a0d86f3ad94b89e8450ad..96044d191844cc11511751f2afe6fc3412c06062 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 d6e33c1cbe84c72a3aaf5ca55cef08fe4a86472e..8ae8f027b5b3e1aef526d2f648deefdf902eb076 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 a490a1a3980c573a7b8a8479835282b6cb30bacb..503fb6d6136a2db73be11e1dbb7de39ff73e005e 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 ba2b3b5de9b6f0c3adce60714923b43d8487320c..5a39a4734550150d5c3006916b70a35b1cb5eeb2 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 cf16fd20d4e65d8ec8db1a19d1d5068fb5537c14..c0c9555171ce189c5c892b730f2eda5b67cbf546 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 63501ea7b6119709b53221a77467f5ce745f0877..b4d12e6b67825509b52e353cd07467d6126b1d9b 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 670d570267257560e5f0fbf5b73cbe3b10fdda32..1ac6268618d59582167a5d1f877f7423cd50ab3d 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 3c41ea81b373a1dcd32c21b0068cc3d6057d5fb7..c83179bde9212605431d24e9b22fa2ee9221b24b 100644
--- a/config/locales/devise/devise.sv.yml
+++ b/config/locales/devise/devise.sv.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 sv:
   errors:
     messages:
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 91c904dc19272fdd90ec7dcecff953cb322287cb..0f9ec4f091456fceec50be0bfbd67e2873b68695 100644
--- a/config/locales/diaspora/cs.yml
+++ b/config/locales/diaspora/cs.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/cy.yml b/config/locales/diaspora/cy.yml
index e0198b1b696995ce5eeeba5810ab1937567ac76e..97b4fd3df79ef6145d6d83b96df839fb9ece0bf0 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.
 
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 9c7d67f4da99e4c89ffd9166316261d3c1bf8d9c..dd3cead597219a101875f753f53ac6dce9510dc8 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.
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 9db8087468defb05a338f6d2fda78e26441cebfd..025aed1493677d5c4423e2f2a934968923aadda3 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.
 
diff --git a/config/locales/diaspora/es.yml b/config/locales/diaspora/es.yml
index 1f6b6b2e75441582735cff28e720d9ac912dafd0..37657e1f40d3da5b8fee3f1d660ae4a6aced0ddd 100644
--- a/config/locales/diaspora/es.yml
+++ b/config/locales/diaspora/es.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/fr-informal.yml b/config/locales/diaspora/fr-informal.yml
index 2342ff1cefa470d60425992d84ac414fe2de9777..141584dad5f4d074abbe02d74d1d41fbcc2e9cf9 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.
 
diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml
index bb44c6f27eeff62ee783e565d113a7cb07635359..4730b3cea9382ea8fa73b9c0244b472094498a68 100644
--- a/config/locales/diaspora/it.yml
+++ b/config/locales/diaspora/it.yml
@@ -2,7 +2,6 @@
 #   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.
 
diff --git a/config/locales/diaspora/lt.yml b/config/locales/diaspora/lt.yml
index e1a529431b9192d7fe815e609ac1e22693ea11fa..01295e3895da41ca95aa628a13ae710a0fb25c89 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 2052779bd14f6703ae992ffaa03a6c164c9e2ccc..c55b7969192553973a4e3d10f135515d30c7b413 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 10425864bfc23af31a02423b7a4847e26c3dba19..aa7a7af358d87f76a5e5cfb6cc500445c30fa2ea 100644
--- a/config/locales/diaspora/pt-BR.yml
+++ b/config/locales/diaspora/pt-BR.yml
@@ -2,7 +2,6 @@
 #   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.
 
diff --git a/config/locales/diaspora/pt-PT.yml b/config/locales/diaspora/pt-PT.yml
index ce3d9abbc458f3fc51172881e1542e0ce1603dc0..6df399150c8ca51f34f26631d80e0a62cac0d087 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/ru.yml b/config/locales/diaspora/ru.yml
index 1b5d3b958853e8df4fee5b18494816aaa7664888..cc76b9b426fbeca18e91255ff623becae9456499 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.
 
diff --git a/config/locales/diaspora/sv.yml b/config/locales/diaspora/sv.yml
index dfb8deb7f3499a965695cdf70197764fb414294f..1aa9ac2dcee2fb6b1843de5a379821be1684831f 100644
--- a/config/locales/diaspora/sv.yml
+++ b/config/locales/diaspora/sv.yml
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Swedish localization file.
 # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
diff --git a/config/selenium.yml b/config/selenium.yml
index 74ce21d73b86ecec22b00b6656d2e0719ff455f5..0d679b602e13781ade17de32f46d671c231a7f76 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 eba9fa45b4fed6293c00bab137b76a11a9503a7a..188daedcb3c52a890b6444cc11754e4ef6983789 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/thin.yml b/config/thin.yml
index ad91436c1a55b7b5ad4d6edc63a878d1a2cd2128..a49d85ce4e11db1a3b6bab1bf3727cf60d295345 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/lib/tasks/db.rake b/lib/tasks/db.rake
index 4b6202f29b8b8cf43472cba3b3ee0ae41e4c9617..e4e379a2a2d66587be542c8d745e62f57de68d69 100644
--- a/lib/tasks/db.rake
+++ b/lib/tasks/db.rake
@@ -2,8 +2,6 @@
 #   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
diff --git a/lib/tasks/rspec.rake b/lib/tasks/rspec.rake
index 35f0b8a98ff86eab13fb67933e09af10e931a7f2..54442d71ea8d980447739fde820a38a7f1dd0bb7 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'
diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash
index 117a78ed9082bdf9882a7690e480ec80fbcb18e7..83c779b0c66cd1b1bf20cc0bd5ab18af405d9f23 100755
--- a/ubuntu-setup.bash
+++ b/ubuntu-setup.bash
@@ -8,7 +8,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 # Set extented globbing
 shopt -s extglob