diff --git a/Gemfile b/Gemfile
index 0aedb538248..78a22e4e954 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,6 +9,7 @@ gem 'jekyll-paginate'
 gem 'jekyll-redirect-from'
 gem 'puma'
 gem 'pry', group: :test
+gem 'rack', '~> 1.0'
 gem 'rack-jekyll'
 gem 'rack-ssl-enforcer'
 gem 'rake'
@@ -18,7 +19,7 @@ gem 'rubocop', group: :test
 
 # All of this is for Slate / middleman
 
-gem "middleman"
+gem "middleman", '~> 3.0'
 
 # For syntax highlighting
 gem "middleman-syntax"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4cb0afcb203..4192c773fe9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,32 +19,32 @@ GIT
 
 GIT
   remote: https://github.com/travis-ci/dpl
-  revision: 91e405cdf2b45ee692787d81d09cb887c2d2ae19
+  revision: 598b6f50e68eb0c7dd828e9424a8fd0198049b67
   specs:
-    dpl (2.0.0.beta.1)
+    dpl (2.0.0.beta.3)
       cl (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.11.1)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.0)
+    ast (2.4.1)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.10)
-    cl (1.2.1)
+    chunky_png (1.3.11)
+    cl (1.2.4)
       regstry (~> 1.0.3)
-    coderay (1.1.2)
+    coderay (1.1.3)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -58,29 +58,27 @@ GEM
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.15.2)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    ffi (1.11.1)
+    ffi (1.13.1)
     forwardable-extended (2.6.0)
-    haml (5.0.4)
+    haml (5.1.2)
       temple (>= 0.8.0)
       tilt
     hike (1.2.3)
     hooks (0.4.1)
       uber (~> 0.0.14)
-    html-proofer (3.12.0)
+    html-proofer (3.15.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogiri (~> 1.10)
+      nokogumbo (~> 2.0)
       parallel (~> 1.3)
       rainbow (~> 3.0)
-      timerizer (~> 0.3)
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    jaro_winkler (1.5.1)
-    jekyll (3.8.4)
+    jekyll (3.8.7)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -94,21 +92,21 @@ GEM
       rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
     jekyll-paginate (1.1.0)
-    jekyll-redirect-from (0.14.0)
-      jekyll (~> 3.3)
+    jekyll-redirect-from (0.16.0)
+      jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.1.0)
+    json (2.3.1)
     kramdown (1.17.0)
     libv8 (3.16.14.19)
-    liquid (4.0.0)
+    liquid (4.0.3)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
-    method_source (0.9.0)
+    method_source (1.0.0)
     middleman (3.4.1)
       coffee-script (~> 2.2)
       compass (>= 1.0.0, < 2.0.0)
@@ -132,48 +130,51 @@ GEM
       rack (>= 1.4.5, < 2.0)
       thor (>= 0.15.2, < 2.0)
       tilt (~> 1.4.1, < 2.0)
-    middleman-gh-pages (0.3.1)
+    middleman-gh-pages (0.4.1)
       rake (> 0.9.3)
-    middleman-livereload (3.3.4)
+    middleman-livereload (3.4.6)
       em-websocket (~> 0.5.1)
-      middleman-core (~> 3.2)
+      middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
     middleman-sprockets (3.5.0)
       middleman-core (>= 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
       sprockets-sass (~> 1.3.0)
-    middleman-syntax (3.0.0)
+    middleman-syntax (3.2.0)
       middleman-core (>= 3.2)
-      rouge (~> 2.0)
-    mime-types (3.1)
+      rouge (~> 3.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2020.0512)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
-    multipart-post (2.0.0)
+    minitest (5.14.1)
+    multi_json (1.14.1)
+    multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.10.8)
+    nio4r (2.5.2)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.2)
+      nokogiri (~> 1.8, >= 1.8.4)
     padrino-helpers (0.12.9)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.12.9)
       tilt (>= 1.4.1, < 3)
     padrino-support (0.12.9)
       activesupport (>= 3.1)
-    parallel (1.17.0)
-    parser (2.5.1.0)
-      ast (~> 2.4.0)
-    pathutil (0.16.1)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    powerpack (0.1.2)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (4.0.1)
-    puma (3.12.6)
-    rack (1.6.12)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.5)
+    puma (4.3.5)
+      nio4r (~> 2.0)
+    rack (1.6.13)
     rack-jekyll (0.5.0)
       jekyll (>= 1.3)
       listen (>= 1.3)
@@ -181,29 +182,34 @@ GEM
     rack-livereload (0.3.17)
       rack
     rack-ssl-enforcer (0.2.9)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
-    rake (12.3.3)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rake (13.0.1)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
     rdiscount (2.2.0.1)
-    redcarpet (3.4.0)
+    redcarpet (3.5.0)
     ref (2.0.0)
+    regexp_parser (1.7.1)
     regstry (1.0.15)
-    rouge (2.2.1)
-    rubocop (0.57.2)
-      jaro_winkler (~> 1.5.1)
+    rexml (3.2.4)
+    rouge (3.20.0)
+    rubocop (0.86.0)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.9.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.1.0)
+      parser (>= 2.7.0.1)
+    ruby-progressbar (1.10.1)
     ruby18_source_location (0.2)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
     sass (3.4.25)
     sprockets (2.12.5)
       hike (~> 1.2)
@@ -215,26 +221,25 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    temple (0.8.0)
+    temple (0.8.2)
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (0.20.0)
+    thor (1.0.1)
     thread_safe (0.3.6)
     tilt (1.4.1)
-    timerizer (0.3.2)
-    typhoeus (1.3.1)
+    typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uber (0.0.15)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.7.0)
     xpath (2.1.0)
       nokogiri (~> 1.3)
-    yell (2.2.0)
+    yell (2.2.2)
 
 PLATFORMS
   ruby
@@ -248,13 +253,14 @@ DEPENDENCIES
   jekyll (>= 3.1.6)
   jekyll-paginate
   jekyll-redirect-from
-  middleman
+  middleman (~> 3.0)
   middleman-gh-pages
   middleman-livereload
   middleman-syntax
   netrc
   pry
   puma
+  rack (~> 1.0)
   rack-jekyll
   rack-ssl-enforcer
   rake