Merge remote-tracking branch 'upstream/dev' into dev

Dockerfile

 FROM ubuntu:trusty
 
 RUN apt-get update
-RUN apt-get install -yq ruby ruby-dev build-essential git
+RUN apt-get install -yq ruby ruby-dev build-essential git nodejs
 RUN gem install --no-ri --no-rdoc bundler
 ADD Gemfile /app/Gemfile
 ADD Gemfile.lock /app/Gemfile.lock

Gemfile

@@ -4,9 +4,8 @@ source 'https://rubygems.org'
 gem 'middleman', '~>3.3.10'
 gem 'middleman-gh-pages', '~> 0.0.3'
 gem 'middleman-syntax', '~> 2.0.0'
-gem 'middleman-autoprefixer', '~> 2.4.4'
-gem 'rouge', '~> 1.9.0'
+gem 'middleman-autoprefixer', '~> 2.5.0'
+gem 'rouge', '~> 1.9.1'
 gem 'redcarpet', '~> 3.3.2'
 
 gem 'rake', '~> 10.4.2'
-gem 'therubyracer', '~> 0.12.1', platforms: :ruby

Gemfile.lock

 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.11)
+    activesupport (4.1.12)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    autoprefixer-rails (5.2.0.1)
+    autoprefixer-rails (5.2.1.1)
       execjs
       json
     celluloid (0.16.0)
@@ -31,7 +31,7 @@ GEM
       sass (>= 3.2, < 3.5)
     erubis (2.7.0)
     execjs (2.5.2)
-    ffi (1.9.8)
+    ffi (1.9.10)
     haml (4.0.6)
       tilt
     hike (1.2.3)
@@ -40,8 +40,7 @@ GEM
       uber (~> 0.0.4)
     i18n (0.7.0)
     json (1.8.3)
-    kramdown (1.7.0)
-    libv8 (3.16.14.7)
+    kramdown (1.8.0)
     listen (2.10.1)
       celluloid (~> 0.16.0)
       rb-fsevent (>= 0.9.3)
@@ -57,7 +56,7 @@ GEM
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-autoprefixer (2.4.4)
+    middleman-autoprefixer (2.5.0)
       autoprefixer-rails (~> 5.2.0)
       middleman-core (>= 3.3.3)
     middleman-core (3.3.12)
@@ -83,7 +82,7 @@ GEM
       middleman-core (~> 3.2)
       rouge (~> 1.0)
     minitest (5.7.0)
-    multi_json (1.11.1)
+    multi_json (1.11.2)
     padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
       padrino-support (= 0.12.5)
@@ -98,10 +97,9 @@ GEM
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redcarpet (3.3.2)
-    ref (1.0.5)
-    rouge (1.9.0)
-    sass (3.4.14)
-    sprockets (2.12.3)
+    rouge (1.9.1)
+    sass (3.4.16)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -111,9 +109,6 @@ GEM
     sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    therubyracer (0.12.2)
-      libv8 (~> 3.16.14.0)
-      ref
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -131,10 +126,12 @@ PLATFORMS
 
 DEPENDENCIES
   middleman (~> 3.3.10)
-  middleman-autoprefixer (~> 2.4.4)
+  middleman-autoprefixer (~> 2.5.0)
   middleman-gh-pages (~> 0.0.3)
   middleman-syntax (~> 2.0.0)
   rake (~> 10.4.2)
   redcarpet (~> 3.3.2)
-  rouge (~> 1.9.0)
-  therubyracer (~> 0.12.1)
+  rouge (~> 1.9.1)
+
+BUNDLED WITH
+   1.10.5

source/index.md

@@ -8,7 +8,7 @@ language_tabs:
 
 toc_footers:
   - <a href='#'>Sign Up for a Developer Key</a>
-  - <a href='http://github.com/tripit/slate'>Documentation Powered by Slate</a>
+  - <a href='https://github.com/tripit/slate'>Documentation Powered by Slate</a>
 
 includes:
   - errors
@@ -22,7 +22,7 @@ Welcome to the Kittn API! You can use our API to access Kittn API endpoints, whi
 
 We have language bindings in Shell, Ruby, and Python! You can view code examples in the dark area to the right, and you can switch the programming language of the examples with the tabs in the top right.
 
-This example API documentation page was created with [Slate](http://github.com/tripit/slate). Feel free to edit it and use it as a base for your own API's documentation.
+This example API documentation page was created with [Slate](https://github.com/tripit/slate). Feel free to edit it and use it as a base for your own API's documentation.
 
 # Authentication
 

source/stylesheets/print.css.scss

@@ -48,6 +48,12 @@ body {
     font-size: 0.8em;
   }
 
+  pre {
+    code {
+      border: 0;
+    }
+  }
+
   pre {
     padding: 1.3em;
   }