Merge pull request #752 from wilkie/bugfix/update_twitter_gem

Updates twitter gem and increases minor patches of all other gems.

Gemfile

@@ -32,7 +32,7 @@ gem "bson",                     "~> 1.7.0"
 gem "bson_ext",                 "~> 1.7.0"
 gem "i18n",                     "~> 0.6.0"
 gem "tire",                     "~> 0.4.1"
-gem "twitter",                  "~> 4.0.0"
+gem "twitter",                  "~> 4.6.0"
 gem "pony",                     "~> 1.3"
 gem "rdiscount",                "~> 1.6.8"
 gem "ratom",                    "~> 0.7.2"

Gemfile.lock

@@ -111,7 +111,7 @@ GEM
     fabrication (1.2.0)
     faraday (0.8.6)
       multipart-post (~> 1.1)
-    ffi (1.4.0)
+    ffi (1.5.0)
     fssm (0.2.10)
     haml (3.1.8)
     haml-rails (0.3.5)
@@ -228,7 +228,7 @@ GEM
       websocket (~> 1.0.4)
     show_me_the_cookies (1.1.4)
       capybara (~> 1.0)
-    simple_oauth (0.1.9)
+    simple_oauth (0.2.0)
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
@@ -255,10 +255,10 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    twitter (4.0.0)
-      faraday (~> 0.8)
-      multi_json (~> 1.3)
-      simple_oauth (~> 0.1.6)
+    twitter (4.6.2)
+      faraday (~> 0.8, < 0.10)
+      multi_json (~> 1.0)
+      simple_oauth (~> 0.2)
     tzinfo (0.3.37)
     uglifier (1.0.4)
       execjs (>= 0.3.0)
@@ -269,7 +269,6 @@ GEM
       raindrops (~> 0.6)
     vcr (1.10.3)
     webmock (1.6.4)
-      addressable (~> 2.2, > 2.2.5)
       addressable (~> 2.2, > 2.2.5)
       crack (>= 0.1.7)
     websocket (1.0.7)
@@ -329,7 +328,7 @@ DEPENDENCIES
   therubyracer (~> 0.11.3)
   thin (~> 1.5.0)
   tire (~> 0.4.1)
-  twitter (~> 4.0.0)
+  twitter (~> 4.6.0)
   tzinfo (~> 0.3.29)
   uglifier (~> 1.0.0)
   unicorn (~> 4.0.1)