Merge pull request #1554 from mitchellh/sethvargo/update_middleman

Update website to use latest middleman

website/Gemfile

-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem "middleman", "~> 3.1.5"
-gem "middleman-minify-html", "~> 3.1.1"
-gem "rack-contrib", "~> 1.1.0"
-gem "redcarpet", "~> 3.0.0"
-gem "therubyracer", "~> 0.12.0"
-gem "thin", "~> 1.5.0"
+gem "less",                  "~> 2.6"
+gem "middleman",             "~> 3.3"
+gem "middleman-minify-html", "~> 3.4"
+gem "rack-contrib",          "~> 1.1"
+gem "redcarpet",             "~> 3.1"
+gem "therubyracer",          "~> 0.12"
+gem "thin",                  "~> 1.6"
 
 group :development do
-  gem "highline", "~> 1.6.15"
+  gem "highline", "~> 1.6"
 end

website/Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.15)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    chunky_png (1.2.9)
-    coffee-script (2.2.0)
+    activesupport (4.1.6)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    celluloid (0.16.0)
+      timers (~> 4.0.0)
+    chunky_png (1.3.1)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
-    compass (0.12.2)
+    coffee-script-source (1.8.0)
+    commonjs (0.2.7)
+    compass (1.0.1)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
+      compass-core (~> 1.0.1)
+      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.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
     daemons (1.1.9)
+    erubis (2.7.0)
     eventmachine (1.0.3)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.9.0)
-    fssm (0.2.10)
-    haml (4.0.3)
+    execjs (2.2.1)
+    ffi (1.9.5)
+    haml (4.0.5)
       tilt
-    highline (1.6.20)
+    highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.5)
-    kramdown (1.2.0)
-    libv8 (3.16.14.3)
-    listen (1.3.1)
+    hitimes (1.2.2)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
+    htmlcompressor (0.1.2)
+    i18n (0.6.11)
+    json (1.8.1)
+    kramdown (1.4.2)
+    less (2.6.0)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.7)
+    listen (2.7.11)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
-    middleman (3.1.6)
-      coffee-script (~> 2.2.0)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
+    middleman (3.3.6)
+      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.1.6)
-      middleman-more (= 3.1.6)
+      middleman-core (= 3.3.6)
       middleman-sprockets (>= 3.1.2)
-      sass (>= 3.1.20)
-      uglifier (~> 2.1.0)
-    middleman-core (3.1.6)
-      activesupport (~> 3.2.6)
+      sass (>= 3.4.0, < 4.0)
+      uglifier (~> 2.5)
+    middleman-core (3.3.6)
+      activesupport (~> 4.1.0)
       bundler (~> 1.1)
-      i18n (~> 0.6.1)
-      listen (~> 1.1)
-      rack (>= 1.4.5)
-      rack-test (~> 0.6.1)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (>= 2.7.9, < 3.0)
+      padrino-helpers (~> 0.12.3)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
       thor (>= 0.15.2, < 2.0)
-      tilt (~> 1.3.6)
-    middleman-minify-html (3.1.1)
-      middleman-core (~> 3.0)
-    middleman-more (3.1.6)
-    middleman-sprockets (3.1.4)
-      middleman-core (>= 3.0.14)
-      middleman-more (>= 3.0.14)
-      sprockets (~> 2.1)
-      sprockets-helpers (~> 1.0.0)
-      sprockets-sass (~> 1.0.0)
-    multi_json (1.8.2)
+      tilt (~> 1.4.1, < 2.0)
+    middleman-minify-html (3.4.0)
+      htmlcompressor (~> 0.1.0)
+      middleman-core (>= 3.2)
+    middleman-sprockets (3.3.10)
+      middleman-core (~> 3.3)
+      sprockets (~> 2.12.1)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.2.0)
+    minitest (5.4.2)
+    multi_json (1.10.1)
+    padrino-helpers (0.12.3)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.3)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.3)
+      activesupport (>= 3.1)
     rack (1.5.2)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.0.0)
+    redcarpet (3.1.2)
     ref (1.0.5)
-    sass (3.2.12)
-    sprockets (2.10.0)
+    sass (3.4.5)
+    sprockets (2.12.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.0.1)
+    sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.0.2)
+    sprockets-sass (1.2.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    therubyracer (0.12.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.5.1)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.18.1)
-    tilt (1.3.7)
-    uglifier (2.1.2)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
+    timers (4.0.1)
+      hitimes
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    uber (0.0.8)
+    uglifier (2.5.3)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  highline (~> 1.6.15)
-  middleman (~> 3.1.5)
-  middleman-minify-html (~> 3.1.1)
-  rack-contrib (~> 1.1.0)
-  redcarpet (~> 3.0.0)
-  therubyracer (~> 0.12.0)
-  thin (~> 1.5.0)
+  highline (~> 1.6)
+  less (~> 2.6)
+  middleman (~> 3.3)
+  middleman-minify-html (~> 3.4)
+  rack-contrib (~> 1.1)
+  redcarpet (~> 3.1)
+  therubyracer (~> 0.12)
+  thin (~> 1.6)

website/counter.txt

-Just update this if you want to force a website push and it isn't
-working:
-
-1