diff --git a/Changelog.md b/Changelog.md
index ccaa87b4e..11eb8daf3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -26,7 +26,7 @@
 * Add flash-notice when sending messages to non-contacts. [#3723](https://github.com/diaspora/diaspora/pull/3723)
 * Re-add hovercards [#3802](https://github.com/diaspora/diaspora/pull/3802)
 * Add images to notifications [#3821](https://github.com/diaspora/diaspora/pull/3821)
-* Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822) 
+* Show pod version in footer and updated the link to the changelog [#3822](https://github.com/diaspora/diaspora/pull/3822)
 
 ## Bug Fixes
 
@@ -45,6 +45,37 @@
 
 * Removed `debugger` since it was causing bundle problems, and is not necessary given 1.9.3 has a built-in debugger.
 * jasmine 1.2.1 -> 1.3.1 (+ remove useless spec)
+* foreman 0.60.2 -> 0.61
+* unicorn 4.4.0 -> 4.5.0
+* omniauth-twitter 0.0.13 -> 0.0.14
+* twitter 4.2.0 -> 4.4.4
+* rails_admin 0.2.0 -> 0.4.1
+* rack 1.4.3 -> 1.4.4
+* rack-rewrite 1.3.1 -> 1.3.3
+* asset_sync 0.5.0 -> 0.5.4
+* fog 1.6.0 -> 1.8.0
+* rails-i18n 0.7.0 -> 0.7.2
+* nokogiri 1.5.5 -> 1.5.6
+* ruby-oembed 0.8.7 -> 0.8.8
+* mobile-fu 1.1.0 -> 1.1.1
+* will_paginate 3.0.4 -> 3.0.5
+* sass 3.2.3 -> 3.2.5
+* bootstap-sass 2.1.1.0 -> 2.2.2.0
+* sass-rails 3.2.5 -> 3.2.6
+* handlebars_assets 0.6.6 -> 0.8.2
+* jquery-rails 2.1.3 -> 2.1.4
+* gon 4.0.1 -> 4.0.2
+* guard 1.5.4 -> 1.6.1
+    * guard-cucumber 1.2.2 -> 1.3.2
+    * guard-rspec 2.1.1 -> 2.3.3
+    * guard-spork 1.2.3 -> 1.4.1
+    * rb-fsevent 0.9.2 -> 0.9.3
+    * rb-inotify 0.8.8 -> 0.9.0
+* rspec 2.11.0 -> 2.12.0
+* rspec-rails 2.11.4 -> 2.12.2
+* selenium-webdriver 2.26.0 -> 2.27.2
+* fixture_builder 0.3.4 -> 0.3.5
+* ffi 1.1.5 -> 1.3.1
 
 # 0.0.2.2
 
diff --git a/Gemfile b/Gemfile
index 61f24e298..710d99d52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,9 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.2.11'
 
-gem 'foreman', '0.60.2'
+gem 'foreman', '0.61'
 
-gem 'unicorn', '4.4.0', :require => false
+gem 'unicorn', '4.5.0', :require => false
 
 gem 'rails_autolink', '1.0.9'
 
@@ -28,9 +28,9 @@ gem 'remotipart', '1.0.2'
 gem 'omniauth', '1.1.1'
 gem 'omniauth-facebook', '1.4.1'
 gem 'omniauth-tumblr', '1.1'
-gem 'omniauth-twitter', '0.0.13'
+gem 'omniauth-twitter', '0.0.14'
 
-gem 'twitter', '4.2.0'
+gem 'twitter', '4.4.4'
 
 # mail
 
@@ -38,10 +38,10 @@ gem 'markerb', :git => 'https://github.com/plataformatec/markerb.git'
 gem 'messagebus_ruby_api', '1.0.3'
 
 group :production do # we don't install these on travis to speed up test runs
-  gem 'rails_admin', '0.2.0'
+  gem 'rails_admin', '0.4.1'
   gem 'fastercsv', '1.5.5', :require => false
   gem 'rack-ssl', '1.3.2', :require => 'rack/ssl'
-  gem 'rack-rewrite', '1.3.1', :require => false
+  gem 'rack-rewrite', '1.3.3', :require => false
 
   # analytics
   gem 'rack-google-analytics', '0.11.0', :require => 'rack/google-analytics'
@@ -61,7 +61,7 @@ gem 'sqlite3' if ENV['DB'] == 'all' || ENV['DB'] == 'sqlite'
 # file uploading
 
 gem 'carrierwave', '0.7.1'
-gem 'fog', '1.6.0'
+gem 'fog', '1.8.0'
 gem 'mini_magick', '3.4'
 
 # JSON and API
@@ -72,14 +72,14 @@ gem 'acts_as_api', '0.4.1 '
 # localization
 
 gem 'i18n-inflector-rails', '~> 1.0'
-gem 'rails-i18n', '0.7.0'
+gem 'rails-i18n', '0.7.2'
 
 # parsing
 
-gem 'nokogiri', '1.5.5'
+gem 'nokogiri', '1.5.6'
 gem 'redcarpet', "2.2.2"
 gem 'roxml', :git => 'https://github.com/Empact/roxml.git', :ref => '7ea9a9ffd2338aaef5b0'
-gem 'ruby-oembed', '0.8.7'
+gem 'ruby-oembed', '0.8.8'
 
 # queue
 
@@ -99,17 +99,17 @@ gem 'typhoeus', '0.3.3'
 # views
 
 gem 'haml', '3.1.7'
-gem 'mobile-fu', '1.1.0'
+gem 'mobile-fu', '1.1.1'
 
-gem 'will_paginate', '3.0.3'
+gem 'will_paginate', '3.0.4'
 gem 'client_side_validations', '3.2.1'
-gem 'gon', '4.0.1'
+gem 'gon', '4.0.2'
 
 # assets
 
 group :assets do
-  gem 'bootstrap-sass', '2.1.1.0'
-  gem 'sass-rails', '3.2.5'
+  gem 'bootstrap-sass', '2.2.2.0'
+  gem 'sass-rails', '3.2.6'
 
   # Windows and OSX have an execjs compatible runtime built-in, Linux users should
   # install Node.js or use 'therubyracer'.
@@ -118,13 +118,13 @@ group :assets do
 
   # gem 'therubyracer', :platform => :ruby
 
-  gem 'handlebars_assets', '0.6.6'
+  gem 'handlebars_assets', '0.8.2'
   gem 'uglifier', '1.3.0'
 
-  gem "asset_sync", '0.5.0', :require => false
+  gem "asset_sync", '0.5.4', :require => false
 end
 
-gem 'jquery-rails', '2.1.3'
+gem 'jquery-rails', '2.1.4'
 
 # web
 
@@ -143,26 +143,25 @@ group :test do
   gem 'cucumber-rails', '1.3.0', :require => false
   gem 'database_cleaner', '0.9.1'
 
-  gem 'timecop', '0.5.3'
+  gem 'timecop', '0.5.9'
   gem 'factory_girl_rails', '4.1.0'
-  gem 'fixture_builder', '0.3.4'
+  gem 'fixture_builder', '0.3.5'
   gem 'fuubar', '1.1.0'
   gem 'rspec-instafail', '0.2.4', :require => false
-  gem 'selenium-webdriver', '2.27.1'
+  gem 'selenium-webdriver', '2.27.2'
 
   gem 'webmock', '1.8.11', :require => false
 
   gem 'spork', '1.0.0rc3'
-  gem 'guard-rspec', '2.1.1'
-  gem 'guard-spork', '1.2.3'
-  gem 'guard-cucumber', '1.2.2'
-  gem 'rb-inotify', '0.8.8', :require => false
-  gem 'rb-fsevent', '0.9.2', :require => false
-
+  gem 'guard-rspec', '2.3.3'
+  gem 'guard-spork', '1.4.1'
+  gem 'guard-cucumber', '1.3.2'
+  gem 'rb-inotify', '0.9.0', :require => false
+  gem 'rb-fsevent', '0.9.3', :require => false
 end
 
 group :test, :development do
-  gem "rspec-rails", "2.11.4"
+  gem "rspec-rails", "2.12.2"
 end
 
 group :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index e5868ccf8..c08890f2c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,11 +55,12 @@ GEM
       rack (>= 1.1.0)
     addressable (2.3.2)
     arel (3.0.2)
-    asset_sync (0.5.0)
+    asset_sync (0.5.4)
       activemodel
       fog
     bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.1.1.0)
+    bootstrap-sass (2.2.2.0)
+      sass (~> 3.2)
     builder (3.0.4)
     capistrano (2.12.0)
       highline
@@ -108,7 +109,7 @@ GEM
       warden (~> 1.2.1)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    excon (0.16.7)
+    excon (0.16.10)
     execjs (1.4.0)
       multi_json (~> 1.0)
     factory_girl (4.1.0)
@@ -121,11 +122,11 @@ GEM
     faraday_middleware (0.9.0)
       faraday (>= 0.7.4, < 0.9)
     fastercsv (1.5.5)
-    ffi (1.2.0)
-    fixture_builder (0.3.4)
+    ffi (1.3.1)
+    fixture_builder (0.3.5)
       activerecord (>= 2)
       activesupport (>= 2)
-    fog (1.6.0)
+    fog (1.8.0)
       builder
       excon (~> 0.14)
       formatador (~> 0.2.0)
@@ -135,12 +136,12 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (~> 1.5.0)
       ruby-hmac
-    font-awesome-sass-rails (2.0.0.0)
+    font-awesome-sass-rails (3.0.0.1)
       railties (>= 3.1.1)
       sass-rails (>= 3.1.1)
     foreigner (1.2.1)
       activerecord (>= 3.0.0)
-    foreman (0.60.2)
+    foreman (0.61.0)
       thor (>= 0.13.6)
     formatador (0.2.4)
     fuubar (1.1.0)
@@ -149,27 +150,26 @@ GEM
       ruby-progressbar (~> 1.0.0)
     gherkin (2.11.5)
       json (>= 1.4.6)
-    gon (4.0.1)
+    gon (4.0.2)
       actionpack (>= 2.3.0)
       json
-    guard (1.5.4)
-      listen (>= 0.4.2)
+    guard (1.6.1)
+      listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-cucumber (1.2.2)
+    guard-cucumber (1.3.2)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (2.1.1)
+    guard-rspec (2.3.3)
       guard (>= 1.1)
       rspec (~> 2.11)
-    guard-spork (1.2.3)
+    guard-spork (1.4.1)
       childprocess (>= 0.2.3)
       guard (>= 1.1)
       spork (>= 0.8.4)
-      sys-proctable
     haml (3.1.7)
-    handlebars_assets (0.6.6)
+    handlebars_assets (0.8.2)
       execjs (>= 1.2.9)
       sprockets (>= 2.0.3)
       tilt
@@ -192,13 +192,12 @@ GEM
       selenium-webdriver (>= 0.1.3)
     jasmine-core (1.3.1)
     journey (1.0.4)
-    jquery-rails (2.1.3)
-      railties (>= 3.1.0, < 5.0)
-      thor (~> 0.14)
-    jquery-ui-rails (2.0.2)
+    jquery-rails (2.1.4)
+      railties (>= 3.0, < 5.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (3.0.1)
       jquery-rails
       railties (>= 3.1.0)
-    jruby-pageant (1.1.1)
     json (1.7.5)
     jwt (0.1.5)
       multi_json (>= 1.0)
@@ -209,7 +208,7 @@ GEM
     libwebsocket (0.1.7.1)
       addressable
       websocket
-    listen (0.5.3)
+    listen (0.7.2)
     lumberjack (1.0.2)
     mail (2.4.4)
       i18n (>= 0.4.0)
@@ -220,22 +219,21 @@ GEM
     mime-types (1.19)
     mini_magick (3.4)
       subexec (~> 0.2.1)
-    mobile-fu (1.1.0)
+    mobile-fu (1.1.1)
       rack-mobile-detect
       rails
     multi_json (1.5.0)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
-    nested_form (0.2.3)
+    nested_form (0.3.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
-    net-ssh (2.6.0)
-      jruby-pageant (>= 1.1.1)
+    net-ssh (2.6.3)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.5)
+    nokogiri (1.5.6)
     oauth (0.4.7)
     oauth2 (0.8.0)
       faraday (~> 0.8)
@@ -256,16 +254,16 @@ GEM
       omniauth (~> 1.0)
     omniauth-tumblr (1.1)
       omniauth-oauth (~> 1.0)
-    omniauth-twitter (0.0.13)
+    omniauth-twitter (0.0.14)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
     orm_adapter (0.4.0)
     polyglot (0.3.3)
-    pry (0.9.10)
+    pry (0.9.11.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
-      slop (~> 3.3.1)
-    rack (1.4.3)
+      slop (~> 3.4)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-cors (0.2.7)
@@ -274,12 +272,12 @@ GEM
     rack-mobile-detect (0.4.0)
       rack
     rack-piwik (0.1.3)
-    rack-pjax (0.6.0)
+    rack-pjax (0.7.0)
       nokogiri (~> 1.5)
       rack (~> 1.3)
     rack-protection (1.2.0)
       rack
-    rack-rewrite (1.3.1)
+    rack-rewrite (1.3.3)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
@@ -292,18 +290,18 @@ GEM
       activesupport (= 3.2.11)
       bundler (~> 1.0)
       railties (= 3.2.11)
-    rails-i18n (0.7.0)
+    rails-i18n (0.7.2)
       i18n (~> 0.5)
-    rails_admin (0.2.0)
+    rails_admin (0.4.1)
       bootstrap-sass (~> 2.1)
       builder (~> 3.0)
       coffee-rails (~> 3.1)
-      font-awesome-sass-rails (~> 2.0)
+      font-awesome-sass-rails (~> 3.0, >= 3.0.0.1)
       haml (~> 3.1)
       jquery-rails (~> 2.1)
-      jquery-ui-rails (~> 2.0)
+      jquery-ui-rails (~> 3.0)
       kaminari (~> 0.14)
-      nested_form (~> 0.2.3)
+      nested_form (~> 0.2)
       rack-pjax (~> 0.6)
       rails (~> 3.1)
       remotipart (~> 1.0)
@@ -319,8 +317,8 @@ GEM
       thor (>= 0.14.6, < 2.0)
     raindrops (0.10.0)
     rake (10.0.3)
-    rb-fsevent (0.9.2)
-    rb-inotify (0.8.8)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
       ffi (>= 0.5.0)
     rdoc (3.12)
       json (~> 1.4)
@@ -337,40 +335,42 @@ GEM
     resque-timeout (1.0.0)
       resque (~> 1.0)
     rmagick (2.13.1)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-instafail (0.2.4)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-mocks (2.12.1)
+    rspec-rails (2.12.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     ruby-hmac (0.4.0)
-    ruby-oembed (0.8.7)
+    ruby-oembed (0.8.8)
     ruby-progressbar (1.0.2)
     rubyzip (0.9.9)
-    sass (3.2.3)
-    sass-rails (3.2.5)
+    sass (3.2.5)
+    sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.27.1)
+    selenium-webdriver (2.27.2)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
-    simple_oauth (0.1.9)
+    simple_oauth (0.2.0)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.3.3)
+    slop (3.4.3)
     spork (1.0.0rc3)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -378,24 +378,23 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.2)
-    sys-proctable (0.9.2)
     thor (0.16.0)
     tilt (1.3.3)
-    timecop (0.5.3)
+    timecop (0.5.9)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (4.2.0)
-      faraday (~> 0.8)
-      multi_json (~> 1.3)
-      simple_oauth (~> 0.1.6)
+    twitter (4.4.4)
+      faraday (~> 0.8, < 0.10)
+      multi_json (~> 1.0)
+      simple_oauth (~> 0.2)
     typhoeus (0.3.3)
       mime-types
     tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    unicorn (4.4.0)
+    unicorn (4.5.0)
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
@@ -406,8 +405,8 @@ GEM
     webmock (1.8.11)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
-    websocket (1.0.4)
-    will_paginate (3.0.3)
+    websocket (1.0.6)
+    will_paginate (3.0.4)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -419,8 +418,8 @@ DEPENDENCIES
   acts-as-taggable-on (= 2.3.3)
   acts_as_api (= 0.4.1)
   addressable (= 2.3.2)
-  asset_sync (= 0.5.0)
-  bootstrap-sass (= 2.1.1.0)
+  asset_sync (= 0.5.4)
+  bootstrap-sass (= 2.2.2.0)
   capistrano (= 2.12.0)
   capistrano_colors (= 0.5.5)
   capybara (= 1.1.3)
@@ -434,44 +433,44 @@ DEPENDENCIES
   faraday (= 0.8.4)
   faraday_middleware (= 0.9.0)
   fastercsv (= 1.5.5)
-  fixture_builder (= 0.3.4)
-  fog (= 1.6.0)
+  fixture_builder (= 0.3.5)
+  fog (= 1.8.0)
   foreigner (= 1.2.1)
-  foreman (= 0.60.2)
+  foreman (= 0.61)
   fuubar (= 1.1.0)
-  gon (= 4.0.1)
-  guard-cucumber (= 1.2.2)
-  guard-rspec (= 2.1.1)
-  guard-spork (= 1.2.3)
+  gon (= 4.0.2)
+  guard-cucumber (= 1.3.2)
+  guard-rspec (= 2.3.3)
+  guard-spork (= 1.4.1)
   haml (= 3.1.7)
-  handlebars_assets (= 0.6.6)
+  handlebars_assets (= 0.8.2)
   http_accept_language (= 1.0.2)
   i18n-inflector-rails (~> 1.0)
   jasmine (= 1.3.1)
-  jquery-rails (= 2.1.3)
+  jquery-rails (= 2.1.4)
   json (= 1.7.5)
   markerb!
   messagebus_ruby_api (= 1.0.3)
   mini_magick (= 3.4)
-  mobile-fu (= 1.1.0)
+  mobile-fu (= 1.1.1)
   mysql2 (= 0.3.11)
-  nokogiri (= 1.5.5)
+  nokogiri (= 1.5.6)
   omniauth (= 1.1.1)
   omniauth-facebook (= 1.4.1)
   omniauth-tumblr (= 1.1)
-  omniauth-twitter (= 0.0.13)
+  omniauth-twitter (= 0.0.14)
   rack-cors (= 0.2.7)
   rack-google-analytics (= 0.11.0)
   rack-piwik (= 0.1.3)
   rack-protection (= 1.2)
-  rack-rewrite (= 1.3.1)
+  rack-rewrite (= 1.3.3)
   rack-ssl (= 1.3.2)
   rails (= 3.2.11)
-  rails-i18n (= 0.7.0)
-  rails_admin (= 0.2.0)
+  rails-i18n (= 0.7.2)
+  rails_admin (= 0.4.1)
   rails_autolink (= 1.0.9)
-  rb-fsevent (= 0.9.2)
-  rb-inotify (= 0.8.8)
+  rb-fsevent (= 0.9.3)
+  rb-inotify (= 0.9.0)
   redcarpet (= 2.2.2)
   remotipart (= 1.0.2)
   resque (= 1.23.0)
@@ -479,15 +478,15 @@ DEPENDENCIES
   rmagick
   roxml!
   rspec-instafail (= 0.2.4)
-  rspec-rails (= 2.11.4)
-  ruby-oembed (= 0.8.7)
-  sass-rails (= 3.2.5)
-  selenium-webdriver (= 2.27.1)
+  rspec-rails (= 2.12.2)
+  ruby-oembed (= 0.8.8)
+  sass-rails (= 3.2.6)
+  selenium-webdriver (= 2.27.2)
   spork (= 1.0.0rc3)
-  timecop (= 0.5.3)
-  twitter (= 4.2.0)
+  timecop (= 0.5.9)
+  twitter (= 4.4.4)
   typhoeus (= 0.3.3)
   uglifier (= 1.3.0)
-  unicorn (= 4.4.0)
+  unicorn (= 4.5.0)
   webmock (= 1.8.11)
-  will_paginate (= 3.0.3)
+  will_paginate (= 3.0.4)
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index a33832750..e58d1bcc2 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -38,7 +38,7 @@ describe ApplicationHelper do
       end
       @current_user = alice
     end
-    
+
     after do
       AppConfig.configured_services = @old_configured_services
     end
@@ -97,7 +97,7 @@ describe ApplicationHelper do
     it 'displays the supplied pod_name if it is set' do
       old_name = AppConfig.settings.pod_name.get
       AppConfig.settings.pod_name = "Catspora"
-      pod_name.should == "Catspora"
+      pod_name.should match "Catspora"
       AppConfig.settings.pod_name = old_name
     end
   end
@@ -107,7 +107,7 @@ describe ApplicationHelper do
     it 'displays the supplied pod_version if it is set' do
       old_version = AppConfig.version.number.get
       AppConfig.version.number = "0.0.1.0"
-      pod_version.should == "0.0.1.0"
+      pod_version.should match "0.0.1.0"
       AppConfig.version.number = old_version
     end
   end