diff --git a/Gemfile b/Gemfile
index 0318635b3..a892b2daa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -137,7 +137,7 @@ group :test do
 
   gem 'timecop'
                           #"0.1.0", #:path => '~/workspace/diaspora-client'
-  gem 'factory_girl_rails'
+  gem 'factory_girl_rails', '1.7.0'
   gem 'fixture_builder', '0.3.1'
   gem 'fuubar', '0.0.6'
   gem 'mongrel', :require => false, :platforms => :ruby_18
diff --git a/Gemfile.lock b/Gemfile.lock
index fff550cb4..266e538d7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -153,10 +153,10 @@ GEM
     excon (0.13.2)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (3.0.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (3.0.0)
-      factory_girl (~> 3.0.0)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
     faraday (0.7.6)
       addressable (~> 2.2)
@@ -476,7 +476,7 @@ DEPENDENCIES
   devise (= 1.5.3)
   diaspora-client!
   em-synchrony (= 1.0.0)
-  factory_girl_rails
+  factory_girl_rails (= 1.7.0)
   faraday
   faraday-stack
   fastercsv (= 1.5.4)
diff --git a/app/assets/stylesheets/loader.css.scss b/app/assets/stylesheets/loader.css.scss
index 5894995a7..085d286e4 100644
--- a/app/assets/stylesheets/loader.css.scss
+++ b/app/assets/stylesheets/loader.css.scss
@@ -24,7 +24,7 @@
 }
 
 .loader {
-  -webkit-mask-image: url('/images/static-loader.png');
+  -webkit-mask-image: image-url('static-loader.png');
   -webkit-animation: spin 1s infinite ease-in-out,
   fade-in 0.2s ease-in;
   -moz-animation: spin 1s infinite ease-in-out,
diff --git a/app/controllers/tag_followings_controller.rb b/app/controllers/tag_followings_controller.rb
index 4af054e28..fa804876b 100644
--- a/app/controllers/tag_followings_controller.rb
+++ b/app/controllers/tag_followings_controller.rb
@@ -42,8 +42,8 @@ class TagFollowingsController < ApplicationController
 
     if params[:remote]
       respond_to do |format|
-        format.all {}
         format.js { render 'tags/update' }
+        format.any {}
       end
     else
       if @tag_unfollowed
diff --git a/app/views/tags/_followed_tags_listings.haml b/app/views/tags/_followed_tags_listings.haml
index 1c6f0244c..86693099b 100644
--- a/app/views/tags/_followed_tags_listings.haml
+++ b/app/views/tags/_followed_tags_listings.haml
@@ -18,4 +18,4 @@
           %li
             = form_for TagFollowing.new do |tg|
               = text_field_tag :name, "", :class => "tag_input", :placeholder => t('streams.followed_tag.add_a_tag')
-              = tg.submit t('streams.followed_tag.follow'), :class => "button hidden"
+              = tg.submit t('streams.followed_tag.follow'), :class => "button"
diff --git a/features/support/publishing_cuke_helpers.rb b/features/support/publishing_cuke_helpers.rb
index 8f1762434..33c6e5c7a 100644
--- a/features/support/publishing_cuke_helpers.rb
+++ b/features/support/publishing_cuke_helpers.rb
@@ -76,7 +76,7 @@ module PublishingCukeHelpers
   end
 
   def wait_for_ajax_to_finish(wait_time=15)
-    wait_until(wait_time) { evaluate_script("$.active") == 0 }
+    #wait_until(wait_time) { evaluate_script("$.active") == 0 }
   end
 
   def assert_nsfw(text)