Update gems and config

Gemfile

@@ -2,11 +2,13 @@
 # the following line to use "http://" instead
 source 'https://rubygems.org'
 
-gem "middleman", "~>3.3.7"
+gem "bourbon"
-gem "middleman-deploy"
+
+gem "middleman"
+gem "mgd"
 
 # Live-reloading plugin
-gem "middleman-livereload", "~> 3.1.0"
+gem "middleman-livereload"
 
 # For faster file watcher updates on Windows:
 gem "wdm", "~> 0.1.0", :platforms => [:mswin, :mingw]

Gemfile.lock

@@ -1,141 +1,124 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.16)
+    activesupport (5.0.1)
-      i18n (~> 0.6, >= 0.6.9)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
-      json (~> 1.7, >= 1.7.7)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    celluloid (0.16.0)
+    addressable (2.5.0)
-      timers (~> 4.0.0)
+      public_suffix (~> 2.0, >= 2.0.2)
-    chunky_png (1.3.6)
+    backports (3.6.8)
+    bourbon (4.2.7)
+      sass (~> 3.4)
+      thor (~> 0.19)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.10.0)
+    coffee-script-source (1.12.2)
-    compass (1.0.3)
-      chunky_png (~> 1.2)
-      compass-core (~> 1.0.2)
-      compass-import-once (~> 1.0.5)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-      sass (>= 3.3.13, < 3.5)
-    compass-core (1.0.3)
-      multi_json (~> 1.0)
-      sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
+    concurrent-ruby (1.0.4)
+    contracts (0.13.0)
+    dotenv (2.1.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.2.0.1)
+    eventmachine (1.2.1)
     execjs (2.7.0)
-    ffi (1.9.14)
+    fast_blank (1.0.0)
+    fastimage (2.0.1)
+      addressable (~> 2)
+    ffi (1.9.17)
     haml (4.0.7)
       tilt
-    hike (1.2.3)
+    hamster (3.0.0)
-    hitimes (1.2.4)
+      concurrent-ruby (~> 1.0)
-    hooks (0.4.1)
+    hashie (3.4.6)
-      uber (~> 0.0.14)
     http_parser.rb (0.6.0)
     i18n (0.7.0)
-    json (1.8.3)
+    kramdown (1.13.2)
-    kramdown (1.11.1)
+    listen (3.0.8)
-    listen (2.10.1)
+      rb-fsevent (~> 0.9, >= 0.9.4)
-      celluloid (~> 0.16.0)
+      rb-inotify (~> 0.9, >= 0.9.7)
-      rb-fsevent (>= 0.9.3)
+    memoist (0.15.0)
-      rb-inotify (>= 0.9)
+    mgd (0.2.0)
-    middleman (3.3.12)
+      middleman (>= 3.0.0)
+      trollop (= 2.1.2)
+    middleman (4.2.0)
       coffee-script (~> 2.2)
-      compass (>= 1.0.0, < 2.0.0)
       compass-import-once (= 1.0.5)
-      execjs (~> 2.0)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-core (= 3.3.12)
+      middleman-cli (= 4.2.0)
-      middleman-sprockets (>= 3.1.2)
+      middleman-core (= 4.2.0)
       sass (>= 3.4.0, < 4.0)
-      uglifier (~> 2.5)
+    middleman-cli (4.2.0)
-    middleman-core (3.3.12)
+      thor (>= 0.17.0, < 2.0)
-      activesupport (~> 4.1.0)
+    middleman-core (4.2.0)
+      activesupport (>= 4.2, < 5.1)
+      addressable (~> 2.3)
+      backports (~> 3.6)
       bundler (~> 1.1)
+      contracts (~> 0.13.0)
+      dotenv
       erubis
-      hooks (~> 0.3)
+      execjs (~> 2.0)
+      fast_blank
+      fastimage (~> 2.0)
+      hamster (~> 3.0)
+      hashie (~> 3.4)
       i18n (~> 0.7.0)
-      listen (>= 2.7.9, < 3.0)
+      listen (~> 3.0.0)
-      padrino-helpers (~> 0.12.3)
+      memoist (~> 0.14)
-      rack (>= 1.4.5, < 2.0)
+      padrino-helpers (~> 0.13.0)
-      rack-test (~> 0.6.2)
+      parallel
-      thor (>= 0.15.2, < 2.0)
+      rack (>= 1.4.5, < 3)
-      tilt (~> 1.4.1, < 2.0)
+      sass (>= 3.4)
-    middleman-deploy (1.0.0)
+      servolux
-      middleman-core (>= 3.2)
+      tilt (~> 2.0)
-      net-sftp
+      uglifier (~> 3.0)
-      ptools
+    middleman-livereload (3.4.6)
-    middleman-livereload (3.1.1)
+      em-websocket (~> 0.5.1)
-      em-websocket (>= 0.2.0)
-      middleman-core (>= 3.0.2)
-      multi_json (~> 1.0)
-      rack-livereload
-    middleman-sprockets (3.4.2)
       middleman-core (>= 3.3)
-      sprockets (~> 2.12.1)
+      rack-livereload (~> 0.3.15)
-      sprockets-helpers (~> 1.1.0)
+    minitest (5.10.1)
-      sprockets-sass (~> 1.3.0)
+    padrino-helpers (0.13.3.3)
-    minitest (5.9.0)
-    multi_json (1.12.1)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
-    padrino-helpers (0.12.8)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.8)
+      padrino-support (= 0.13.3.3)
-      tilt (~> 1.4.1)
+      tilt (>= 1.4.1, < 3)
-    padrino-support (0.12.8)
+    padrino-support (0.13.3.3)
       activesupport (>= 3.1)
-    ptools (1.3.3)
+    parallel (1.10.0)
-    rack (1.6.4)
+    public_suffix (2.0.5)
+    rack (2.0.1)
     rack-livereload (0.3.16)
       rack
-    rack-test (0.6.3)
+    rb-fsevent (0.9.8)
-      rack (>= 1.0)
-    rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    sass (3.4.22)
+    sass (3.4.23)
-    sprockets (2.12.4)
+    servolux (0.12.0)
-      hike (~> 1.2)
+    thor (0.19.4)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.1.0)
-      sprockets (~> 2.0)
-    sprockets-sass (1.3.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
-    thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (1.4.1)
+    tilt (2.0.5)
-    timers (4.0.4)
+    trollop (2.1.2)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.15)
+    uglifier (3.0.4)
-    uglifier (2.7.2)
+      execjs (>= 0.3.0, < 3)
-      execjs (>= 0.3.0)
-      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  middleman (~> 3.3.7)
+  bourbon
-  middleman-deploy
+  mgd
-  middleman-livereload (~> 3.1.0)
+  middleman
+  middleman-livereload
   tzinfo-data
   wdm (~> 0.1.0)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

Rakefile

@@ -1,4 +0,0 @@
-task "deploy" do
-  sh "git add public; git commit -m 'Deployed to gh-pages'"
-  sh "git subtree push --prefix public origin gh-pages"
-end

config.rb

@@ -72,8 +72,3 @@ configure :build do
   # Or use a different image path
   # set :http_prefix, "/Content/images/"
 end
-
-activate :deploy do |deploy|
-  deploy.method = :git
-  deploy.branch = 'gh-pages'
-end