Merge branch 'master' of github.com:diaspora/diaspora into pivots

Gemfile

@@ -22,6 +22,7 @@ gem 'will_paginate', '3.0.pre'
 #Uncatagorized
 gem 'roxml', :git => 'git://github.com/Empact/roxml.git'
 gem 'addressable', :require => 'addressable/uri'
+gem 'json'
 
 #Standards
 gem 'pubsubhubbub'
@@ -47,7 +48,6 @@ group :test do
   gem 'database_cleaner'
   gem 'saucelabs-adapter', '= 0.8.12'
   gem 'selenium-rc'
-  gem 'json'
 end
 
 group :development do

config/selenium.yml

@@ -7,7 +7,7 @@ local: &local
   test_framework: webrat
   selenium_server_address: "127.0.0.1"
   selenium_server_port: "4444"
-  selenium_browser_key: "*chrome /Applications/Firefox.app/Contents/MacOS/firefox-bin"
+  selenium_browser_key: "*chrome /usr/bin/firefox"
   application_address: "127.0.0.1"
   application_port: "4000"