diff --git a/website/Gemfile.lock b/website/Gemfile.lock
index 170034efc..6b8e19a04 100644
--- a/website/Gemfile.lock
+++ b/website/Gemfile.lock
@@ -1,63 +1,67 @@
 GIT
   remote: git://github.com/hashicorp/middleman-hashicorp.git
-  revision: b82c2c2fdc244cd0bd529ff27cfab24e43f07708
+  revision: 783fe9517dd02badb85e5ddfeda4d8e35bbd05a8
   specs:
     middleman-hashicorp (0.1.0)
-      bootstrap-sass (~> 3.2)
+      bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       less (~> 2.6)
       middleman (~> 3.3)
-      middleman-livereload (~> 3.3)
+      middleman-livereload (~> 3.4)
       middleman-minify-html (~> 3.4)
       middleman-syntax (~> 2.0)
-      rack-contrib (~> 1.1)
+      rack-contrib (~> 1.2)
       rack-rewrite (~> 1.5)
       rack-ssl-enforcer (~> 0.2)
-      redcarpet (~> 3.1)
+      redcarpet (~> 3.2)
       therubyracer (~> 0.12)
       thin (~> 1.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.1.6)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    bootstrap-sass (3.2.0.2)
-      sass (~> 3.2)
+    autoprefixer-rails (5.1.7.1)
+      execjs
+      json
+    bootstrap-sass (3.3.4.1)
+      autoprefixer-rails (>= 5.0.0.1)
+      sass (>= 3.2.19)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    chunky_png (1.3.3)
+    chunky_png (1.3.4)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     commonjs (0.2.7)
-    compass (1.0.1)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      compass-core (~> 1.0.1)
+      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.1)
+    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)
-    daemons (1.1.9)
+    daemons (1.2.2)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.0.3)
-    execjs (2.2.2)
-    ffi (1.9.6)
-    haml (4.0.5)
+    eventmachine (1.0.7)
+    execjs (2.4.0)
+    ffi (1.9.8)
+    haml (4.0.6)
       tilt
     hike (1.2.3)
     hitimes (1.2.2)
@@ -65,86 +69,86 @@ GEM
       uber (~> 0.0.4)
     htmlcompressor (0.1.2)
     http_parser.rb (0.6.0)
-    i18n (0.6.11)
-    json (1.8.1)
-    kramdown (1.5.0)
+    i18n (0.7.0)
+    json (1.8.2)
+    kramdown (1.6.0)
     less (2.6.0)
       commonjs (~> 0.2.7)
     libv8 (3.16.14.7)
-    listen (2.7.11)
+    listen (2.9.0)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    middleman (3.3.6)
+    middleman (3.3.10)
       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.6)
+      middleman-core (= 3.3.10)
       middleman-sprockets (>= 3.1.2)
       sass (>= 3.4.0, < 4.0)
       uglifier (~> 2.5)
-    middleman-core (3.3.6)
+    middleman-core (3.3.10)
       activesupport (~> 4.1.0)
       bundler (~> 1.1)
       erubis
       hooks (~> 0.3)
-      i18n (~> 0.6.9)
+      i18n (~> 0.7.0)
       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.4.1, < 2.0)
-    middleman-livereload (3.3.4)
+    middleman-livereload (3.4.2)
       em-websocket (~> 0.5.1)
-      middleman-core (~> 3.2)
+      middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
     middleman-minify-html (3.4.0)
       htmlcompressor (~> 0.1.0)
       middleman-core (>= 3.2)
-    middleman-sprockets (3.3.10)
-      middleman-core (~> 3.3)
+    middleman-sprockets (3.4.2)
+      middleman-core (>= 3.3)
       sprockets (~> 2.12.1)
       sprockets-helpers (~> 1.1.0)
-      sprockets-sass (~> 1.2.0)
+      sprockets-sass (~> 1.3.0)
     middleman-syntax (2.0.0)
       middleman-core (~> 3.2)
       rouge (~> 1.0)
-    minitest (5.4.2)
-    multi_json (1.10.1)
-    padrino-helpers (0.12.4)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    padrino-helpers (0.12.5)
       i18n (~> 0.6, >= 0.6.7)
-      padrino-support (= 0.12.4)
+      padrino-support (= 0.12.5)
       tilt (~> 1.4.1)
-    padrino-support (0.12.4)
+    padrino-support (0.12.5)
       activesupport (>= 3.1)
-    rack (1.5.2)
-    rack-contrib (1.1.0)
+    rack (1.6.0)
+    rack-contrib (1.2.0)
       rack (>= 0.9.1)
     rack-livereload (0.3.15)
       rack
-    rack-rewrite (1.5.0)
+    rack-rewrite (1.5.1)
     rack-ssl-enforcer (0.2.8)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    redcarpet (3.2.0)
+    redcarpet (3.2.2)
     ref (1.0.5)
-    rouge (1.7.2)
-    sass (3.4.6)
-    sprockets (2.12.2)
+    rouge (1.8.0)
+    sass (3.4.13)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sprockets-helpers (1.1.0)
       sprockets (~> 2.0)
-    sprockets-sass (1.2.0)
+    sprockets-sass (1.3.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
     therubyracer (0.12.1)
@@ -155,14 +159,14 @@ GEM
       eventmachine (~> 1.0)
       rack (~> 1.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uber (0.0.10)
-    uglifier (2.5.3)
+    uber (0.0.13)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 
diff --git a/website/source/assets/images/favicon.ico b/website/source/assets/images/favicon.ico
new file mode 100644
index 000000000..fa5bd4589
Binary files /dev/null and b/website/source/assets/images/favicon.ico differ
diff --git a/website/source/layouts/layout.erb b/website/source/layouts/layout.erb
index 898de87c1..192b7303d 100644
--- a/website/source/layouts/layout.erb
+++ b/website/source/layouts/layout.erb
@@ -6,6 +6,16 @@
 
 		<%= stylesheet_link_tag "application" %>
 
+    <meta name="HandheldFriendly" content="True" />
+    <meta name="MobileOptimized" content="320" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+    <link rel="shortcut icon" href="<%= image_path("favicon.ico") %>" type="image/x-icon">
+    <link rel="icon" href="<%= image_path("favicon.ico") %>" type="image/x-icon">
+
 		<script type="text/javascript" src="//use.typekit.net/apr3jjs.js"></script>
 		<script type="text/javascript">try{Typekit.load();}catch(e){}</script>
 	</head>