Merge branch 'master' into jk_basic_shard_support

Gemfile.lock

@@ -192,7 +192,7 @@ GEM
     multipart-post (1.2.0)
     net-http-persistent (2.8)
     net-http-pipeline (1.0.1)
-    newrelic_rpm (3.6.1.85.beta)
+    newrelic_rpm (3.6.1.88)
     pg (0.13.2)
     polyglot (0.3.3)
     pry (0.9.12)
@@ -207,7 +207,7 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.3.2)
+    rack-protection (1.5.0)
       rack
     rack-ssl (1.3.3)
       rack
@@ -246,7 +246,7 @@ GEM
       redis (~> 3)
       redis-namespace
     signature (0.1.6)
-    sinatra (1.3.4)
+    sinatra (1.3.6)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
@@ -268,7 +268,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
-    tilt (1.3.7)
+    tilt (1.4.0)
     timers (1.1.0)
     treetop (1.4.12)
       polyglot