diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f0ca5bfc8..a39d827e4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class ApplicationController < ActionController::Base
 
   protect_from_forgery :except => :receive
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 2bf1edb76..ba9d3ffd9 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!
 
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 77867af81..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
@@ -57,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
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 08acdd424..a8b8fffc0 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!
 
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index 0866751d0..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!
 
@@ -35,12 +34,10 @@ class PhotosController < ApplicationController
 
       ##############
 
-
       params[:user_file] = file
 
       data = clean_hash(params)
 
-
       @photo = current_user.post(:photo, data)
 
       respond_to do |format|
@@ -103,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 6be195e30..fcfdb0db6 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class PublicsController < ApplicationController
   require File.expand_path('../../../lib/diaspora/parser', __FILE__)
   include Diaspora::Parser
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/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..ef519a1a4 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!
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 819a88d28..260b5b7fa 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class UsersController < ApplicationController
   before_filter :authenticate_user!, :except => [:new, :create]
 
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..688ddb10b 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
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/person.rb b/app/models/person.rb
index a94f4106c..38a55db2b 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 require File.expand_path('../../../lib/hcard', __FILE__)
 
 class Person
diff --git a/app/models/photo.rb b/app/models/photo.rb
index fbab51ea5..15d105739 100644
--- a/app/models/photo.rb
+++ b/app/models/photo.rb
@@ -73,4 +73,3 @@ class Photo < Post
   end
 end
 
-
diff --git a/app/models/post.rb b/app/models/post.rb
index 431d1c7e0..983d0e68f 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Post
   require File.expand_path('../../../lib/encryptable', __FILE__)
   require File.expand_path('../../../lib/diaspora/websocket', __FILE__)
@@ -33,7 +32,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 2bb54028a..2b8303bd1 100644
--- a/app/models/profile.rb
+++ b/app/models/profile.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Profile
   include MongoMapper::EmbeddedDocument
   require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
diff --git a/app/models/request.rb b/app/models/request.rb
index bf9dd8721..5ba4769a2 100644
--- a/app/models/request.rb
+++ b/app/models/request.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 class Request
   require File.expand_path('../../../lib/diaspora/webhooks', __FILE__)
   include MongoMapper::Document
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 272f404bc..ade7b7a2a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -71,7 +71,6 @@ class User
     end
   end
 
-
   def move_friend( opts = {})
     return true if opts[:to] == opts[:from]
     friend = Person.first(:_id => opts[:friend_id])
@@ -107,7 +106,6 @@ class User
     intitial_post(class_name, aspect_ids, options)
   end
 
-
   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)
@@ -270,7 +268,6 @@ class User
     username.downcase! if username
   end
 
-
   def as_json(opts={})
     {
       :user => {
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/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/application.rb b/config/application.rb
index 79302a289..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'
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/deploy.rb b/config/deploy.rb
index 2f8065134..ab240e18c 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
@@ -152,7 +149,6 @@ namespace :db do
     tom_seed
   end
 
-
 end
 
 after "deploy:symlink", "deploy:symlink_images", "deploy:symlink_bundle", 'deploy:symlink_config'
diff --git a/config/environment.rb b/config/environment.rb
index 385a96651..5bde8792b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -2,8 +2,6 @@
 #   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
@@ -11,4 +9,3 @@ Haml::Template.options[:escape_html] = true
 # Initialize the rails application
 Diaspora::Application.initialize!
 
-
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 44ba8e55e..15d1fc2bb 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 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..358e6e092 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
 
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/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/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 ac2e4ba27..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 --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..20f6087bf 100644
--- a/config/initializers/secret_token.rb
+++ b/config/initializers/secret_token.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.
 
 # Your secret key for verifying the integrity of signed cookies.
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.he.yml b/config/locales/devise/devise.he.yml
new file mode 100644
index 000000000..851a90789
--- /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.
+
+
+en:
+  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/diaspora/he.yml b/config/locales/diaspora/he.yml
new file mode 100644
index 000000000..90ced9435
--- /dev/null
+++ b/config/locales/diaspora/he.yml
@@ -0,0 +1,201 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+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:
+          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/routes.rb b/config/routes.rb
index 0ac115b76..7f60bd63b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,8 +2,6 @@
 #   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]
@@ -18,7 +16,6 @@ Diaspora::Application.routes.draw do
   match 'aspects/manage', :to => 'aspects#manage'
   resources :aspects, :except => [:edit]
 
-
   match 'warzombie',          :to => "dev_utilities#warzombie"
   match 'zombiefriends',      :to => "dev_utilities#zombiefriends"
   match 'zombiefriendaccept', :to => "dev_utilities#zombiefriendaccept"
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..261cf3ffe 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
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/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 5b87469ca..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).
 #
diff --git a/db/seeds/backer.rb b/db/seeds/backer.rb
index 22c81778d..bc63a81a9 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).
 #
@@ -16,7 +14,6 @@ require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def create
 
-
   config = YAML.load_file(File.join(File.dirname(__FILE__), "..", "..", "config", "deploy_config.yml"))
   backer_info = config['servers']['backer']
 
diff --git a/db/seeds/dev.rb b/db/seeds/dev.rb
index 375f5221f..f10abec4f 100644
--- a/db/seeds/dev.rb
+++ b/db/seeds/dev.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def set_app_config username
diff --git a/db/seeds/tom.rb b/db/seeds/tom.rb
index b54fedcc0..3f8c4810f 100644
--- a/db/seeds/tom.rb
+++ b/db/seeds/tom.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
 require File.join(File.dirname(__FILE__), "..", "..", "config", "environment")
 
 def set_app_config username
@@ -18,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",
@@ -46,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/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/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..35695c546 100644
--- a/lib/diaspora/user/friending.rb
+++ b/lib/diaspora/user/friending.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module UserModules
     module Friending
@@ -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)
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index bd4174c76..29f119238 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
diff --git a/lib/diaspora/webhooks.rb b/lib/diaspora/webhooks.rb
index 81f7bcfaf..2be45d76a 100644
--- a/lib/diaspora/webhooks.rb
+++ b/lib/diaspora/webhooks.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 module Diaspora
   module Webhooks
     def self.included(klass)
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..5b00ca9ea 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")
diff --git a/lib/encryptor.rb b/lib/encryptor.rb
index ed9fbedb1..d90e8bdfe 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
@@ -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/whitespace.rake b/lib/tasks/whitespace.rake
index 397674ae5..c5b9d4c6e 100644
--- a/lib/tasks/whitespace.rake
+++ b/lib/tasks/whitespace.rake
@@ -3,8 +3,13 @@ namespace :whitespace do
   task :cleanup do
     sh %{find . -name '*.rb' -exec sed -i '' 's/ *$//g' {} \\;}
   end
+  desc 'Converts hard-tabs into two-space soft-tabs'
   task :retab do
     sh %{find . -name '*.rb' -exec sed -i '' 's/\t/  /g' {} \\;}
   end
+  desc 'Remove consecutive blank lines'
+  task :scrub_gratuitous_newlines do
+    sh %{find . -name '*.rb' -exec sed -i '' '/./,/^$/!d' {} \\;}
+  end
 end
 
diff --git a/spec/controllers/albums_controller_spec.rb b/spec/controllers/albums_controller_spec.rb
index e8ea44479..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
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/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/factories.rb b/spec/factories.rb
index 21a7ad110..834304e33 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
@@ -55,7 +53,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
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 3f4e20b1e..e37cf0116 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/spec/lib/diaspora_parser_spec.rb
@@ -2,14 +2,7 @@
 #   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
@@ -88,7 +81,6 @@ 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
@@ -121,7 +113,6 @@ 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)
@@ -140,7 +131,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..adb375c17 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,7 +39,6 @@ describe MessageHandler do
         }
       end
 
-
       it 'should only retry a bad request three times ' do
         request = FakeHttpRequest.new(:failure)
         request.should_receive(:get).exactly(MessageHandler::NUM_TRIES).times.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/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 d03300211..65cb9da60 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
 
diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb
index ea5afc7cf..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
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/person_spec.rb b/spec/models/person_spec.rb
index 721310409..c11d03455 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
@@ -21,7 +19,7 @@ describe Person do
         @user.person.diaspora_handle.should == @user.username + "@example.org"
       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 3e0b68520..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
 
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..4e1380df1 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
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..2f86ac549 100644
--- a/spec/models/user/posting_spec.rb
+++ b/spec/models/user/posting_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/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..8d20bcb96 100644
--- a/spec/models/user/visible_posts_spec.rb
+++ b/spec/models/user/visible_posts_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
   let(:user) { Factory(:user) }
@@ -55,7 +53,6 @@ describe User do
 
   context 'albums' do
 
-
     before do
       @album = user.post :album, :name => "Georges", :to => aspect.id
       aspect.reload
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 1608bbe58..ad7070eaa 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_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
   let(:user)   { Factory(:user) }
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ef5db93c2..fad7dfc5a 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}
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 33b86d52c..b74006e3d 100644
--- a/spec/user_encryption_spec.rb
+++ b/spec/user_encryption_spec.rb
@@ -2,11 +2,7 @@
 #   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
diff --git a/test/performance/browsing_test.rb b/test/performance/browsing_test.rb
index 74e8c9421..9cc248c9f 100644
--- a/test/performance/browsing_test.rb
+++ b/test/performance/browsing_test.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 require 'test_helper'
 require 'rails/performance_test_help'
 
diff --git a/test/selenium/login_test.rb b/test/selenium/login_test.rb
index 321d46e1d..b60d2db8c 100644
--- a/test/selenium/login_test.rb
+++ b/test/selenium/login_test.rb
@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.
 
-
-
 class SampleWebratTest < ActionController::IntegrationTest
 
   def test_widget
diff --git a/test/selenium/selenium_suite.rb b/test/selenium/selenium_suite.rb
index d5362b1d7..7f4df5e4c 100644
--- a/test/selenium/selenium_suite.rb
+++ b/test/selenium/selenium_suite.rb
@@ -2,8 +2,6 @@
 #   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'
diff --git a/test/test_helper.rb b/test/test_helper.rb
index d9742c116..e46a0a70c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -2,8 +2,6 @@
 #   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'