diff --git a/Gemfile.lock b/Gemfile.lock
index f7c6dd0f..501d2b89 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -2,133 +2,112 @@ GEM
   remote: http://gems.github.com/
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.12)
-      multi_json (~> 1.0)
-    addressable (2.3.3)
-    adsf (1.0.1)
+    addressable (2.3.5)
+    adsf (1.1.1)
       rack (>= 1.0.0)
+    atomic (1.1.14)
+    buftok (0.1)
     builder (3.2.2)
-    chunky_png (1.2.8)
-    coderay (1.0.9)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    chunky_png (1.2.9)
+    coderay (1.1.0)
     colored (1.2)
-    cookiejar (0.3.0)
-    cri (2.3.0)
+    cri (2.4.0)
       colored (>= 1.2)
-    curb (0.7.18)
-    daemons (1.1.9)
-    em-http-request (1.0.3)
-      addressable (>= 2.2.3)
-      cookiejar
-      em-socksify
-      eventmachine (>= 1.0.0.beta.4)
-      http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.1)
-      eventmachine (>= 1.0.0.beta.4)
-    em-twitter (0.2.1)
-      eventmachine (~> 1.0)
-      http_parser.rb (~> 0.5)
-      simple_oauth (~> 0.1)
-    eventmachine (1.0.0)
-    faraday (0.8.5)
-      multipart-post (~> 1.1)
-    fastercsv (1.5.5)
-    feedzirra (0.1.3)
-      activesupport (~> 3.1.1)
-      builder (>= 2.1.2)
-      curb (~> 0.7.15)
-      i18n (>= 0.5.0)
-      loofah (~> 1.2.0)
-      nokogiri (>= 1.4.4)
-      rake (>= 0.8.7)
-      rdoc (~> 3.8)
-      sax-machine (~> 0.1.0)
-    ffi (1.9.0)
+    curb (0.8.5)
+    descendants_tracker (0.0.3)
+    equalizer (0.0.7)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    feedzirra (0.3.0)
+      curb (~> 0.8.1)
+      loofah (~> 1.2.1)
+      nokogiri (~> 1.6.0)
+      sax-machine (~> 0.2.1)
+    ffi (1.9.3)
     formatador (0.2.4)
-    geokit (1.6.5)
-      multi_json
-    guard (1.8.2)
+    geokit (1.6.7)
+      multi_json (>= 1.3.2)
+    guard (2.2.4)
       formatador (>= 0.2.4)
-      listen (>= 1.0.0)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
     guard-nanoc (1.0.1)
       guard (>= 1.8.0)
       nanoc (>= 3.6.3)
     htmlentities (4.3.1)
+    http (0.5.0)
+      http_parser.rb
     http_parser.rb (0.5.3)
-    i18n (0.6.5)
     json (1.8.1)
-    launchy (2.2.0)
+    launchy (2.4.0)
       addressable (~> 2.3)
-    listen (1.2.3)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     loofah (1.2.1)
       nokogiri (>= 1.4.4)
     lumberjack (1.0.4)
+    memoizable (0.2.0)
+      thread_safe (~> 0.1.3)
     method_source (0.8.2)
-    mini_portile (0.5.1)
-    multi_json (1.6.1)
-    multipart-post (1.1.5)
-    nanoc (3.6.4)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    multipart-post (1.2.0)
+    nanoc (3.6.6)
       cri (~> 2.3)
     nanoc3 (3.3.0)
       nanoc (>= 3.3.0)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     oauth (0.4.7)
-    oj (2.0.7)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.3)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rack (1.4.5)
-    rake (10.1.0)
+    rack (1.5.2)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
-      ffi (>= 0.5.0)
-    rdiscount (1.6.8)
-    rdoc (3.12.2)
-      json (~> 1.4)
-    retryable (1.3.2)
+    rdiscount (2.1.7)
+    retryable (1.3.3)
     ri_cal (0.8.8)
     rqrcode (0.4.2)
-    rqrcode_png (0.1.1)
+    rqrcode_png (0.1.2)
       chunky_png
       rqrcode
-    sass (3.2.10)
-    sax-machine (0.1.0)
-      nokogiri (> 0.0.0)
+    sass (3.2.12)
+    sax-machine (0.2.1)
+      nokogiri (~> 1.6.0)
     simple_oauth (0.2.0)
-    slop (3.4.6)
+    slop (3.4.7)
     systemu (2.5.2)
-    t (1.7.1)
-      fastercsv (~> 1.5)
+    t (2.0.0)
       geokit (~> 1.6)
       htmlentities (~> 4.3)
-      launchy (~> 2.0)
+      launchy (~> 2.3)
       oauth (~> 0.4)
-      oj (~> 2.0)
       retryable (~> 1.2)
-      thor (>= 0.16, < 2)
-      tweetstream (~> 2.3)
-      twitter (~> 4.4)
+      thor (>= 0.18.1, < 2)
+      twitter (~> 5.0)
     thor (0.18.1)
-    tweetstream (2.4.0)
-      daemons (~> 1.1)
-      em-http-request (~> 1.0.2)
-      em-twitter (~> 0.2)
-      twitter (~> 4.0)
-      yajl-ruby (~> 1.1)
-    twitter (4.5.0)
-      faraday (~> 0.8, < 0.10)
-      multi_json (~> 1.0)
-      simple_oauth (~> 0.2)
-    yajl-ruby (1.1.0)
+    thread_safe (0.1.3)
+      atomic
+    timers (1.1.0)
+    twitter (5.0.0)
+      buftok (~> 0.1.0)
+      descendants_tracker (~> 0.0.1)
+      equalizer (~> 0.0.7)
+      faraday (>= 0.8, < 0.10)
+      http (~> 0.5.0)
+      http_parser.rb (~> 0.5.0)
+      json (~> 1.8)
+      memoizable (~> 0.2.0)
+      simple_oauth (~> 0.2.0)
 
 PLATFORMS
   ruby