Bundle update, change mocha require

Mocha is still being required somewhere else, which is showing a
deprecation warning when running tests.

Gemfile

@@ -8,5 +8,5 @@ gem 'activemodel', '~> 3.2.0'
 gem 'actionpack', '~> 3.2.0'
 gem 'rake'
 gem 'rdoc'
-gem 'mocha'
+gem 'mocha', :require => false
 gem 'tzinfo'

Gemfile.lock

@@ -24,7 +24,7 @@ GEM
     activesupport (3.2.8)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    builder (3.0.3)
+    builder (3.0.4)
     country_select (1.0.1)
     erubis (2.7.0)
     hike (1.2.1)
@@ -32,9 +32,9 @@ GEM
     journey (1.0.4)
     json (1.7.5)
     metaclass (0.0.1)
-    mocha (0.12.5)
+    mocha (0.13.0)
       metaclass (~> 0.0.1)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -58,7 +58,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     thor (0.16.0)
     tilt (1.3.3)
-    tzinfo (0.3.33)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

gemfiles/Gemfile-rails.3.0.x

@@ -8,5 +8,5 @@ gem 'activemodel', '~> 3.0.0'
 gem 'actionpack', '~> 3.0.0'
 gem 'rake'
 gem 'rdoc'
-gem 'mocha'
+gem 'mocha', :require => false
 gem 'tzinfo'

gemfiles/Gemfile-rails.3.1.x

@@ -8,5 +8,5 @@ gem 'activemodel', '~> 3.1.0'
 gem 'actionpack', '~> 3.1.0'
 gem 'rake'
 gem 'rdoc'
-gem 'mocha'
+gem 'mocha', :require => false
 gem 'tzinfo'

test/test_helper.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'test/unit'
-require 'mocha'
+require 'mocha/setup'
 
 require 'active_model'
 require 'action_controller'