diff --git a/Gemfile b/Gemfile
index b5df343a6..96d233a77 100644
--- a/Gemfile
+++ b/Gemfile
@@ -38,9 +38,10 @@ end
 
 group :heroku do
   gem 'pg'
+  gem 'mysql'
 end
 
-gem 'settingslogic', '2.0.6'
+gem 'settingslogic', :git => 'git://github.com/binarylogic/settingslogic.git'
 # database
 
 gem 'activerecord-import'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6beb3d254..755db741c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -15,6 +15,12 @@ GIT
       json
       rails (>= 3.0.0)
 
+GIT
+  remote: git://github.com/binarylogic/settingslogic.git
+  revision: 4884d455bf18d92723cb8190cfd2dbf87f3aafd5
+  specs:
+    settingslogic (2.0.8)
+
 GIT
   remote: git://github.com/diaspora/acts-as-taggable-on.git
   revision: c3592fe1a906f6ff1cd12766c5cf1152c51eec40
@@ -237,6 +243,7 @@ GEM
       gem_plugin (>= 0.2.3)
     multi_json (1.0.4)
     multipart-post (1.1.4)
+    mysql (2.8.1)
     mysql2 (0.2.17)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
@@ -360,7 +367,6 @@ GEM
       ffi (~> 1.0.9)
       multi_json (~> 1.0.4)
       rubyzip
-    settingslogic (2.0.6)
     simple_oauth (0.1.5)
     sinatra (1.2.8)
       rack (~> 1.1)
@@ -450,6 +456,7 @@ DEPENDENCIES
   mobile-fu
   mock_redis
   mongrel
+  mysql
   mysql2 (= 0.2.17)
   newrelic_rpm
   nokogiri (~> 1.5.0)
@@ -479,7 +486,7 @@ DEPENDENCIES
   ruby-oembed
   sass
   selenium-webdriver (~> 2.16.0)
-  settingslogic (= 2.0.6)
+  settingslogic!
   sqlite3
   thin (~> 1.3.1)
   timecop
diff --git a/Procfile b/Procfile
index e65f16603..f8e7db76b 100644
--- a/Procfile
+++ b/Procfile
@@ -1,3 +1,3 @@
-web: bundle exec rails s -p $PORT
+web: bundle exec rails s thin -p $PORT
 redis: redis-server
 worker: QUEUE=* bundle exec rake resque:work
diff --git a/app/controllers/aspect_memberships_controller.rb b/app/controllers/aspect_memberships_controller.rb
index d75832bbf..89327f420 100644
--- a/app/controllers/aspect_memberships_controller.rb
+++ b/app/controllers/aspect_memberships_controller.rb
@@ -54,29 +54,7 @@ class AspectMembershipsController < ApplicationController
     end
   end
 
-  def update
-    @person = Person.find(params[:person_id])
-    @from_aspect = current_user.aspects.where(:id => params[:aspect_id]).first
-    @to_aspect = current_user.aspects.where(:id => params[:to]).first
-
-    response_hash = { }
-
-    unless current_user.move_contact( @person, @to_aspect, @from_aspect)
-      flash[:error] = I18n.t 'aspects.move_contact.error',:inspect => params.inspect
-    end
-    if aspect = current_user.aspects.where(:id => params[:to]).first
-      response_hash[:notice] = I18n.t 'aspects.move_contact.success'
-      response_hash[:success] = true
-    else
-      response_hash[:notice] = I18n.t 'aspects.move_contact.failure'
-      response_hash[:success] = false
-    end
-
-    render :text => response_hash.to_json
-  end
-
   rescue_from ActiveRecord::StatementInvalid do
     render :text => "Duplicate record rejected.", :status => 400
   end
-
 end
diff --git a/app/controllers/community_spotlight_controller.rb b/app/controllers/community_spotlight_controller.rb
deleted file mode 100644
index 837d77bdb..000000000
--- a/app/controllers/community_spotlight_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require File.join(Rails.root, 'lib', 'stream', 'community_spotlight')
-
-class CommunitySpotlightController < ApplicationController
-  def index
-    default_stream_action(Stream::CommunitySpotlight)
-  end
-end
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 30cbe1149..0857378d1 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -42,7 +42,7 @@ class PeopleController < ApplicationController
         #only do it if it is an email address
         if diaspora_id?(params[:q])
           people = Person.where(:diaspora_handle => params[:q].downcase)
-          webfinger(params[:q]) if people.empty?
+          Webfinger.in_background(params[:q]) if people.empty?
         else
           people = Person.search(params[:q], current_user)
         end
@@ -53,7 +53,7 @@ class PeopleController < ApplicationController
         #only do it if it is an email address
         if diaspora_id?(params[:q])
           people = Person.where(:diaspora_handle => params[:q])
-          webfinger(params[:q]) if people.empty?
+          Webfinger.in_background(params[:q]) if people.empty?
         else
           people = Person.search(params[:q], current_user)
         end
@@ -131,7 +131,7 @@ class PeopleController < ApplicationController
 
   def retrieve_remote
     if params[:diaspora_handle]
-      webfinger(params[:diaspora_handle], :single_aspect_form => true)
+      Webfinger.in_background(params[:diaspora_handle], :single_aspect_form => true)
       render :nothing => true
     else
       render :nothing => true, :status => 422
@@ -161,7 +161,6 @@ class PeopleController < ApplicationController
       @contact = current_user.contact_for(@person) || Contact.new
       render :partial => 'aspect_membership_dropdown', :locals => {:contact => @contact, :person => @person, :hang => 'left'}
     end
-    Webfinger.new(account, opts)
   end
 
   def diaspora_id?(query)
@@ -169,9 +168,6 @@ class PeopleController < ApplicationController
   end
 
   private
-  def webfinger(account, opts = {})
-    Webfinger.new(account, opts)
-  end
 
   def remote_profile_with_no_user_session?
     @person && @person.remote? && !user_signed_in?
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7fda03658..f8f6bac23 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -21,7 +21,7 @@ module ApplicationHelper
 
     if language != DEFAULT_LANGUAGE
       translations = I18n.t('javascripts', :locale => language)
-      defaults.update(translations)
+      defaults.deep_merge!(translations)
     end
 
     defaults
diff --git a/app/helpers/posts_helper.rb b/app/helpers/posts_helper.rb
new file mode 100644
index 000000000..1944752df
--- /dev/null
+++ b/app/helpers/posts_helper.rb
@@ -0,0 +1,19 @@
+#   Copyright (c) 2012, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module PostsHelper
+  def post_page_title(post)
+    if post.is_a?(Photo)
+      I18n.t "posts.show.photos_by", :count => 1, :author => post.status_message.author.name
+    elsif post.is_a?(Reshare)
+      I18n.t "posts.show.reshare_by", :author => post.author.name
+    else
+      if post.text.present?
+        truncate(post.text(:plain_text => true), :length => 20)
+      elsif post.respond_to?(:photos) && post.photos.present?
+        I18n.t "posts.show.photos_by", :count => post.photos.size, :author => post.author.name
+      end
+    end
+  end
+end
diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
index 7420e7cb4..44b882380 100644
--- a/app/helpers/stream_helper.rb
+++ b/app/helpers/stream_helper.rb
@@ -5,34 +5,32 @@
 module StreamHelper
   def next_page_path(opts ={})
     if controller.instance_of?(TagsController)
-      tag_path(:name => @stream.tag_name, :max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      tag_path(:name => @stream.tag_name, :max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(AppsController)
       "/apps/1?#{{:max_time => @posts.last.created_at.to_i}.to_param}"
     elsif controller.instance_of?(PeopleController)
-      local_or_remote_person_path(@person, :max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      local_or_remote_person_path(@person, :max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(TagFollowingsController)
-      tag_followings_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
-    elsif controller.instance_of?(CommunitySpotlightController)
-      spotlight_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      tag_followings_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(MentionsController)
-      mentions_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      mentions_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(MultisController)
-      multi_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      multi_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(PostsController)
-      public_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      public_stream_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(AspectsController)
-      aspects_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :a_ids => @stream.aspect_ids)
+      aspects_path(:max_time => time_for_scroll(@stream), :a_ids => @stream.aspect_ids)
     elsif controller.instance_of?(LikeStreamController)
-      like_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      like_stream_path(:max_time => time_for_scroll(@stream))
     elsif controller.instance_of?(CommentStreamController)
-      comment_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
+      comment_stream_path(:max_time => time_for_scroll(@stream))
     else
       raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
     end
   end
 
-  def time_for_scroll(ajax_stream, stream)
-    if ajax_stream || stream.stream_posts.empty?
+  def time_for_scroll(stream)
+    if stream.stream_posts.empty?
       (Time.now() + 1).to_i
     else
       stream.stream_posts.last.send(stream.order.to_sym).to_i
diff --git a/app/models/app_config.rb b/app/models/app_config.rb
index 88857781e..12e266bac 100644
--- a/app/models/app_config.rb
+++ b/app/models/app_config.rb
@@ -6,9 +6,11 @@ require 'uri'
 require File.join(Rails.root, 'lib', 'enviroment_configuration')
 
 class AppConfig < Settingslogic
-  ARRAY_VARS = [:community_spotlight, :admins]
-
   def self.source_file_name
+    if ENV['application_yml'].present?
+      puts "using remote application.yml"
+      return ENV['application_yml']
+    end
     config_file = File.join(Rails.root, "config", "application.yml")
     if !File.exists?(config_file) && (Rails.env == 'test' || Rails.env.include?("integration") || EnviromentConfiguration.heroku?)
       config_file = File.join(Rails.root, "config", "application.yml.example")
@@ -121,18 +123,9 @@ HELP
 
   def self.[] (key)
     return self.pod_uri if key == :pod_uri
-    return fetch_from_env(key.to_s) if EnviromentConfiguration.heroku?
     super
   end
 
-  def fetch_from_env(key)
-    if ARRAY_VARS.include?(key.to_sym)
-      ENV[key].split(EnviromentConfiguration::ARRAY_SEPERATOR)
-    else
-     ENV[key] if ENV[key] 
-    end
-  end
-
   def self.[]= (key, value)
     super
     if key.to_sym == :pod_url
diff --git a/app/models/comment.rb b/app/models/comment.rb
index f8de11dad..ef1e7c3eb 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -84,5 +84,4 @@ class Comment < ActiveRecord::Base
   def parent= parent
     self.post = parent
   end
-
 end
diff --git a/app/models/jobs/fetch_webfinger.rb b/app/models/jobs/fetch_webfinger.rb
new file mode 100644
index 000000000..3b387b6bf
--- /dev/null
+++ b/app/models/jobs/fetch_webfinger.rb
@@ -0,0 +1,13 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module Jobs
+  class FetchWebfinger < Base
+    @queue = :socket_webfinger
+
+    def self.perform(account)
+      Webfinger.new(account).fetch
+    end
+  end
+end
diff --git a/app/models/post.rb b/app/models/post.rb
index 387ce465e..2cdfa5fd3 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -36,7 +36,7 @@ class Post < ActiveRecord::Base
     t.add :user_like
     t.add :mentioned_people
     t.add lambda { |post|
-      if post.photos_count > 0
+      if post.respond_to?(:photos) && post.photos_count > 0
         post.photos
       else
         []
diff --git a/app/models/status_message.rb b/app/models/status_message.rb
index f8a172425..7fe01de82 100644
--- a/app/models/status_message.rb
+++ b/app/models/status_message.rb
@@ -40,10 +40,6 @@ class StatusMessage < Post
     joins(:likes).where(:likes => {:author_id => person.id})
   }
 
-  def photos_count
-    self.photos.size
-  end
-
   def self.guids_for_author(person)
     Post.connection.select_values(Post.where(:author_id => person.id).select('posts.guid').to_sql)
   end
@@ -177,7 +173,7 @@ class StatusMessage < Post
   end
 
   def update_photos_counter
-    StatusMessage.where(:id => self.id).
+    self.class.where(:id => self.id).
       update_all(:photos_count => self.photos.count)
   end
 
@@ -192,6 +188,5 @@ class StatusMessage < Post
   def self.tag_stream(tag_ids)
     joins(:tags).where(:tags => {:id => tag_ids})
   end
-
 end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 2b9bc2362..7c91f29bd 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -172,17 +172,6 @@ class User < ActiveRecord::Base
   end
 
   ######### Aspects ######################
-
-  def move_contact(person, to_aspect, from_aspect)
-    return true if to_aspect == from_aspect
-    contact = contact_for(person)
-
-    add_contact_to_aspect(contact, to_aspect)
-
-    membership = contact ? AspectMembership.where(:contact_id => contact.id, :aspect_id => from_aspect.id).first : nil
-    return(membership && membership.destroy)
-  end
-
   def add_contact_to_aspect(contact, aspect)
     return true if AspectMembership.exists?(:contact_id => contact.id, :aspect_id => aspect.id)
     contact.aspect_memberships.create!(:aspect => aspect)
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 6a5d085bf..cc6ddcad8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -65,6 +65,17 @@
     - if rtl?
       = include_stylesheets :rtl, :media => 'all'
 
+    :javascript
+      // Support for older browsers
+      if(Array.isArray === undefined) {  
+        Array.isArray = function (arg) {  
+          return Object.prototype.toString.call(arg) == '[object Array]';  
+        };  
+      }
+      if ((window.history) && (window.history.pushState === undefined)) {
+        window.history.pushState = function() { };
+      }
+
     = csrf_meta_tag
     <!--[if IE]>
     = javascript_include_tag "/javascripts/ie.js"
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index 9ecf343dc..d230c583c 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -2,6 +2,9 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
+- content_for :page_title do
+  = post_page_title @post
+
 .span-20.append-2.prepend-2.last
 
   #main_stream.stream.status_message_show
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 453483b00..e76e82401 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -614,6 +614,14 @@ en:
       destroy: "Delete"
       permalink: "permalink"
       not_found: "Sorry, we couldn't find that post."
+      photos_by:
+        zero: "No photos by %{author}"
+        one: "One photo by %{author}"
+        two: "Two photos by %{author}"
+        few: "%{count} photos by %{author}"
+        many: "%{count} photos by %{author}"
+        other: "%{count} photos by %{author}"
+      reshare_by: "Reshare by %{author}"
 
   share_visibilites:
     update:
diff --git a/config/routes.rb b/config/routes.rb
index 99cce0ee3..e85117ea5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -114,12 +114,10 @@ Diaspora::Application.routes.draw do
   resources :contacts,           :except => [:update, :create] do
     get :sharing, :on => :collection
   end
-  resources :aspect_memberships, :only  => [:destroy, :create, :update]
+  resources :aspect_memberships, :only  => [:destroy, :create]
   resources :share_visibilities,  :only => [:update]
   resources :blocks, :only => [:create, :destroy]
 
-  get 'spotlight' => 'community_spotlight#index', :as => 'spotlight'
-
   get 'community_spotlight' => "contacts#spotlight", :as => 'community_spotlight'
 
   get 'stream' => "multis#index", :as => 'multi'
diff --git a/features/posts_from_main_page.feature b/features/posts_from_main_page.feature
index c749c2a24..251b782aa 100644
--- a/features/posts_from_main_page.feature
+++ b/features/posts_from_main_page.feature
@@ -99,6 +99,7 @@ Feature: posting from the main page
       Then I should see an uploaded image within the photo drop zone
       And the publisher should be expanded
 
+    @wip
     Scenario: hide a contact's post
       Given I expand the publisher
       When I fill in "status_message_fake_text" with "Here is a post for you to hide"
@@ -114,8 +115,10 @@ Feature: posting from the main page
       And I click to delete the first post
       And I wait for the ajax to finish
       And I go to "bob@bob.bob"'s page
+      And I wait for the ajax to finish
       Then I should not see "Here is a post for you to hide"
       When I am on the aspects page
+      And I wait for the ajax to finish
       Then I should not see "Here is a post for you to hide"
 
     Scenario: delete one of my posts
diff --git a/lib/stream/aspect.rb b/lib/stream/aspect.rb
index 3ddacf0ae..1af899132 100644
--- a/lib/stream/aspect.rb
+++ b/lib/stream/aspect.rb
@@ -65,16 +65,6 @@ class Stream::Aspect < Stream::Base
     end
   end
 
-  # Only ajax in the stream if all aspects are present.
-  # In this case, we know we're on the first page of the stream,
-  # as the default view for aspects/index is showing posts from
-  # all a user's aspects.
-  #
-  # @return [Boolean] see #for_all_aspects?
-  def ajax_stream?
-    !AppConfig[:redis_cache] && for_all_aspects?
-  end
-
   # The title that will display at the top of the stream's
   # publisher box.
   #
diff --git a/lib/stream/base.rb b/lib/stream/base.rb
index 869c0dab6..826954183 100644
--- a/lib/stream/base.rb
+++ b/lib/stream/base.rb
@@ -75,12 +75,6 @@ class Stream::Base
     Rails.application.routes.url_helpers.contacts_path
   end
 
-  #helpers
-  # @return [Boolean]
-  def ajax_stream?
-    false
-  end
-
   # @return [Boolean]
   def for_all_aspects?
     true
diff --git a/lib/stream/community_spotlight.rb b/lib/stream/community_spotlight.rb
deleted file mode 100644
index 340bda6c0..000000000
--- a/lib/stream/community_spotlight.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-class Stream::CommunitySpotlight < Stream::Base
-  def title
-    "Community Spotlight doing cool stuff!"
-  end
-
-  def link(opts={})
-    Rails.application.routes.url_helpers.spotlight_path(opts)
-  end
-
-  def contacts_title
-    "This week's community spotlight"
-  end
-
-  def contacts_link
-    Rails.application.routes.url_helpers.community_spotlight_path
-  end
-
-  def contacts_link_title
-    I18n.translate('aspects.selected_contacts.view_all_community_spotlight')
-  end
-
-  def posts
-    Post.all_public.where(:author_id => people.map{|x| x.id})
-  end
-
-  def people
-   Person.community_spotlight
-  end
-end
diff --git a/lib/stream/multi.rb b/lib/stream/multi.rb
index b4963306a..8e6e62cde 100644
--- a/lib/stream/multi.rb
+++ b/lib/stream/multi.rb
@@ -23,11 +23,6 @@ class Stream::Multi < Stream::Base
     end.call
   end
 
-  # @return [Boolean]
-  def ajax_stream?
-    false
-  end
-
   #emits an enum of the groups which the post appeared
   # :spotlight, :aspects, :tags, :mentioned
   def post_from_group(post)
diff --git a/lib/stream/public.rb b/lib/stream/public.rb
index f5b6f421a..92efc42fd 100644
--- a/lib/stream/public.rb
+++ b/lib/stream/public.rb
@@ -16,7 +16,6 @@ class Stream::Public < Stream::Base
     @posts ||= Post.all_public
   end
 
-
   def contacts_title
     I18n.translate("streams.public.contacts_title")
   end
diff --git a/lib/tasks/heroku.rake b/lib/tasks/heroku.rake
index b786eabb1..22ddd78c7 100644
--- a/lib/tasks/heroku.rake
+++ b/lib/tasks/heroku.rake
@@ -12,15 +12,15 @@ namespace :heroku do
     application_config = YAML.load_file('config/application.yml')['production'] rescue {}
     application_config.delete_if { |k, v| v.nil? or v.to_s.empty? }
 
-    heroku_env = application_config.map do|key, value|
-      value =value.join(EnviromentConfiguration::ARRAY_SEPERATOR) if value.respond_to?(:join)
+    #heroku_env = application_config.map do|key, value|
+      #value =value.join(EnviromentConfiguration::ARRAY_SEPERATOR) if value.respond_to?(:join)
 
-      "#{key}=\"#{value}\""
-    end.join(' ')
+      #"#{key}=\"#{value}\""
+    #end.join(' ')
 
     puts "Generating and setting a new secret token"
     token = ActiveSupport::SecureRandom.hex(40)#reloads secret token every time you reload vars.... this expires cookies, and kinda sucks
-    system "#{HEROKU_CONFIG_ADD_COMMAND} #{heroku_env} SECRET_TOKEN=#{token}"
+    system "#{HEROKU_CONFIG_ADD_COMMAND} HEROKU=true SECRET_TOKEN=#{token}"
   end
 
   task :install_requirements do
diff --git a/lib/webfinger.rb b/lib/webfinger.rb
index d22f7aba0..975557b40 100644
--- a/lib/webfinger.rb
+++ b/lib/webfinger.rb
@@ -9,6 +9,10 @@ class Webfinger
     Rails.logger.info("event=webfinger status=initialized target=#{account}")
   end
 
+  def self.in_background(account, opts={})
+    Resque.enqueue(Jobs::FetchWebfinger, account)
+  end
+
   def fetch
     begin
       person = Person.by_account_identifier(@account)
diff --git a/public/javascripts/ie.js b/public/javascripts/ie.js
index 33be0fdb7..3cdb19683 100644
--- a/public/javascripts/ie.js
+++ b/public/javascripts/ie.js
@@ -1,7 +1,3 @@
 document.createElement('header');
 document.createElement('footer');
 
-// IE 9 work-around for vendor/backbone.js
-if ((window.history) && (document.documentMode == 9)) {
-	window.history.pushState = function() { };
-}
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 055205445..047586227 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -1194,6 +1194,7 @@ header #global_search
       &:focus
         @include box-shadow(0,0,5px,#fff)
         :outline none
+        :background-color white
 
     input[type='search']
       :width 220px
diff --git a/spec/controllers/aspect_memberships_controller_spec.rb b/spec/controllers/aspect_memberships_controller_spec.rb
index fcbb6c24e..ea7a42076 100644
--- a/spec/controllers/aspect_memberships_controller_spec.rb
+++ b/spec/controllers/aspect_memberships_controller_spec.rb
@@ -124,15 +124,4 @@ describe AspectMembershipsController do
       end
     end
   end
-
-  describe "#update" do
-    it 'calls the move_contact method' do
-      @controller.stub!(:current_user).and_return(alice)
-      alice.should_receive(:move_contact)
-      put :update, :id => 123,
-                   :person_id => alice.person.id,
-                   :aspect_id => @aspect0.id,
-                   :to => @aspect1.id
-    end
-  end
 end
diff --git a/spec/controllers/community_spotlight_controller_spec.rb b/spec/controllers/community_spotlight_controller_spec.rb
deleted file mode 100644
index 75c6da0b6..000000000
--- a/spec/controllers/community_spotlight_controller_spec.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe CommunitySpotlightController do
-  describe "GET 'index'" do
-    it "should be successful" do
-      sign_in alice
-      get 'index'
-      response.should be_success
-    end
-  end
-end
diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb
index e776a4eb5..332033cd8 100644
--- a/spec/controllers/people_controller_spec.rb
+++ b/spec/controllers/people_controller_spec.rb
@@ -385,11 +385,4 @@ describe PeopleController do
       @controller.diaspora_id?("ilya_2%3@joindiaspora.com").should be_false
     end
   end
-
-  describe '#webfinger' do
-    it 'calls Webfinger.new' do
-      Webfinger.should_receive(:new).with(@user.diaspora_handle, anything).once
-      get :retrieve_remote, :diaspora_handle => @user.diaspora_handle
-    end
-  end
 end
diff --git a/spec/helpers/stream_helper_spec.rb b/spec/helpers/stream_helper_spec.rb
index 37ba469d0..93f5d8b9d 100644
--- a/spec/helpers/stream_helper_spec.rb
+++ b/spec/helpers/stream_helper_spec.rb
@@ -5,15 +5,4 @@
 require 'spec_helper'
 
 describe StreamHelper do
-  before do
-    @post = Factory(:status_message)
-  end
-
-  describe '#next_page_path' do
-    it 'works for apps page' do
-      stub!(:controller).and_return(AppsController.new)
-      @posts = [Factory(:activity_streams_photo)]
-      next_page_path.should include '/apps/1'
-    end
-  end
 end
diff --git a/spec/lib/stream/aspect_spec.rb b/spec/lib/stream/aspect_spec.rb
index b7e96e52c..45f26fdf1 100644
--- a/spec/lib/stream/aspect_spec.rb
+++ b/spec/lib/stream/aspect_spec.rb
@@ -62,7 +62,7 @@ describe Stream::Aspect do
       stream.posts
     end
 
-    it 'respects ordering' do 
+    it 'respects ordering' do
       stream = Stream::Aspect.new(@alice, [1,2], :order => 'created_at')
       @alice.should_receive(:visible_shareables).with(Post, hash_including(:order => 'created_at DESC')).and_return(stub.as_null_object)
       stream.posts
@@ -132,40 +132,6 @@ describe Stream::Aspect do
     end
   end
 
-  describe '.ajax_stream?' do
-    before do
-      @original_value = AppConfig[:redis_cache] 
-      @stream = Stream::Aspect.new(stub, stub)
-    end
-
-    after do
-      AppConfig[:redis_cache] = @original_value
-    end
-
-    context 'if we are not caching with redis' do
-      before do
-        AppConfig[:redis_cache] = false
-      end
-
-      it 'is true if stream is for all aspects?' do
-        @stream.stub(:for_all_aspects?).and_return(true)
-        @stream.ajax_stream?.should be_true
-      end
-
-      it 'is false if it is not for all aspects' do
-        @stream.stub(:for_all_aspects?).and_return(false)
-        @stream.ajax_stream?.should be_false
-      end
-    end
-
-    context 'if we are caching with redis' do
-      it 'returns false' do
-        AppConfig[:redis_cache] = true
-        @stream.ajax_stream?.should be_false
-      end
-    end
-  end
-
   describe 'shared behaviors' do
     before do
       @stream = Stream::Aspect.new(alice, alice.aspects.map(&:id))
diff --git a/spec/lib/stream/community_spotlight_spec.rb b/spec/lib/stream/community_spotlight_spec.rb
deleted file mode 100644
index b1437c865..000000000
--- a/spec/lib/stream/community_spotlight_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-require File.join(Rails.root, 'spec', 'shared_behaviors', 'stream')
-
-describe Stream::CommunitySpotlight do
-  before do
-    @stream = Stream::CommunitySpotlight.new(Factory(:user), :max_time => Time.now, :order => 'updated_at')
-  end
-
-  describe 'shared behaviors' do
-    it_should_behave_like 'it is a stream'
-  end
-end
diff --git a/spec/models/app_config_spec.rb b/spec/models/app_config_spec.rb
index 69140746e..7ba7180ba 100644
--- a/spec/models/app_config_spec.rb
+++ b/spec/models/app_config_spec.rb
@@ -144,28 +144,6 @@ describe AppConfig do
     end
   end
 
-  context 'configurations which are arrays' do
-
-    it 'should be set to be admins or community_spotlight' do
-      AppConfig::ARRAY_VARS.should =~ [:community_spotlight, :admins]
-    end
-
-    context 'on heroku' do
-      before do
-        ENV['admins'] = "maxwell#{EnviromentConfiguration::ARRAY_SEPERATOR}daniel"
-        EnviromentConfiguration.stub(:heroku?).and_return(true)
-      end
-
-      after do
-        EnviromentConfiguration.stub(:heroku?).and_return(false)
-      end
-
-      it 'converts a string with ARRAY_SEPERATOR to an array' do
-        AppConfig[:admins].should be_a Array
-      end
-    end
-  end
-
   describe ".pod_uri" do
     it "properly parses the pod_url" do
       AppConfig.pod_uri = nil
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index b1ae2fe27..b15e3a133 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -244,4 +244,22 @@ describe Photo do
       }.should_not change(StatusMessage, :count)
     end
   end
+
+  describe 'photo cache counter' do
+    it "works" do
+      @s = @user.build_post(:status_message, :text => "sup?", :to => @aspect.id)
+      @s.save!
+      @s.reload.photos_count.should == 0
+      @s.photos << @photo
+      @s.save!
+      @s.reload.photos_count.should == 1
+      @s.photos << @photo2
+      @s.save!
+      @s.reload.photos_count.should == 2
+      @s.photos.last.destroy
+      @s.reload.photos_count.should == 1
+      @s.photos.first.destroy
+      @s.reload.photos_count.should == 0
+    end
+  end
 end
diff --git a/spec/models/user/querying_spec.rb b/spec/models/user/querying_spec.rb
index d70b9500a..a0314aa28 100644
--- a/spec/models/user/querying_spec.rb
+++ b/spec/models/user/querying_spec.rb
@@ -182,7 +182,7 @@ describe User do
       time = Time.now
       Time.stub(:now).and_return(time)
       alice.send(:prep_opts, Post, {}).should == {
-        :type => Stream::Base::TYPES_OF_POST_IN_STREAM, 
+        :type => Stream::Base::TYPES_OF_POST_IN_STREAM,
         :order => 'created_at DESC',
         :limit => 15,
         :hidden => false,
@@ -198,9 +198,9 @@ describe User do
       Factory(:status_message, :public => true)
       bob.visible_shareables(Post).count.should == 0
     end
+
     context 'with many posts' do
       before do
-        bob.move_contact(eve.person, @bobs_aspect, bob.aspects.create(:name => 'new aspect'))
         time_interval = 1000
         time_past = 1000000
         (1..25).each do |n|
@@ -229,7 +229,7 @@ describe User do
         # It should respect the order option
         opts = {:order => 'updated_at DESC'}
         bob.visible_shareables(Post, opts).first.updated_at.should > bob.visible_shareables(Post, opts).last.updated_at
-        
+
         # It should respect the limit option
         opts = {:limit => 40}
         bob.visible_shareables(Post, opts).length.should == 40
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index ff6269599..c2b513d19 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -708,34 +708,6 @@ describe User do
         alice.add_contact_to_aspect(@contact, @original_aspect).should be_true
       end
     end
-
-    context 'moving and removing posts' do
-      describe 'User#move_contact' do
-        it 'should be able to move a contact from one of users existing aspects to another' do
-          alice.move_contact(bob.person, @new_aspect, @original_aspect)
-
-          @original_aspect.contacts(true).include?(@contact).should be_false
-          @new_aspect.contacts(true).include?(@contact).should be_true
-        end
-
-        it "should not move a person who is not a contact" do
-          non_contact = eve.person
-
-          expect {
-            alice.move_contact(non_contact, @new_aspect, @original_aspect)
-          }.to raise_error
-
-          @original_aspect.contacts.where(:person_id => non_contact.id).should be_empty
-          @new_aspect.contacts.where(:person_id => non_contact.id).should be_empty
-        end
-
-        it 'does not try to delete if add person did not go through' do
-          alice.should_receive(:add_contact_to_aspect).and_return(false)
-          alice.should_not_receive(:delete_person_from_aspect)
-          alice.move_contact(bob.person, @new_aspect, @original_aspect)
-        end
-      end
-    end
   end
 
   context 'likes' do
@@ -1000,7 +972,7 @@ describe User do
       user.should_not_receive(:generate_reset_password_token)
       user.send_reset_password_instructions
     end
-    
+
     it "queues up a job to send the reset password instructions" do
       user = Factory :user
       Resque.should_receive(:enqueue).with(Jobs::ResetPassword, user.id)
diff --git a/spec/shared_behaviors/stream.rb b/spec/shared_behaviors/stream.rb
index 327d1c47d..d2aea4785 100644
--- a/spec/shared_behaviors/stream.rb
+++ b/spec/shared_behaviors/stream.rb
@@ -27,14 +27,6 @@ describe 'Streams' do
         @stream.contacts_link.should_not be_nil
       end
 
-      it 'responds to ajax_stream' do
-        @stream.ajax_stream?.should_not be_nil
-      end
-
-      it 'responds to ajax_stream' do
-        @stream.ajax_stream?.should_not be_nil
-      end
-
       it 'should make the stream a time object' do
         @stream.max_time = 123
         @stream.max_time.should be_a(Time)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index fb133f107..6e22953ef 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -53,6 +53,9 @@ end
 disable_typhoeus
 ProcessedImage.enable_processing = false
 
+AppConfig.load!
+AppConfig.setup!
+
 def set_up_friends
   [local_luke, local_leia, remote_raphael]
 end