From f208307cbdd403d3fa92a1aae1dc9c094c7ec9d8 Mon Sep 17 00:00:00 2001
From: Eric Bidelman
Date: Wed, 11 Jul 2012 10:43:37 -0700
Subject: Bringing in upstream changes

---
 README.html                            |  10 +-
 README.md                              |   8 +-
 app.yaml                               |  23 ++
 images/google_developers_logo_tiny.png | Bin 0 -> 3749 bytes
 js/order.js                            |   8 +
 js/polyfills/bind.js                   |   3 -
 js/polyfills/matchMedia.js             |  30 ---
 js/require-1.0.8.min.js                |  33 +++
 js/slide-controller.js                 |   2 +-
 js/slide-deck.js                       | 116 +++++++--
 js/slides.js                           |  20 +-
 scripts/md/README.md                   |   5 +
 scripts/md/base.html                   |  66 +++++
 scripts/md/render.py                   |  53 ++++
 scripts/md/slides.md                   |  64 +++++
 serve.sh                               |   9 +-
 slide_config.js                        |  36 +++
 slide_config.json                      |  34 ---
 template.html                          |  19 +-
 theme/.base.css.swp                    | Bin 45056 -> 0 bytes
 theme/.default.css.swp                 | Bin 45056 -> 0 bytes
 theme/css/default.css                  | 449 +++++++++++++++++++++------------
 theme/scss/_base.scss                  |   5 +-
 theme/scss/default.scss                | 150 ++++++++++-
 24 files changed, 853 insertions(+), 290 deletions(-)
 create mode 100644 app.yaml
 create mode 100644 images/google_developers_logo_tiny.png
 create mode 100644 js/order.js
 delete mode 100644 js/polyfills/bind.js
 delete mode 100644 js/polyfills/matchMedia.js
 create mode 100644 js/require-1.0.8.min.js
 create mode 100644 scripts/md/README.md
 create mode 100644 scripts/md/base.html
 create mode 100755 scripts/md/render.py
 create mode 100644 scripts/md/slides.md
 create mode 100644 slide_config.js
 delete mode 100644 slide_config.json
 delete mode 100644 theme/.base.css.swp
 delete mode 100644 theme/.default.css.swp

diff --git a/README.html b/README.html
index 690a90d..20276de 100644
--- a/README.html
+++ b/README.html
@@ -49,13 +49,13 @@ pre {
 <h1><img src="images/io2012_logo.png"> HTML5 Slide Template</h1>
 
 <h2>Configuring the slides</h2>
-<p>Much of the deck is customized by changing the settings in <a href="slide_config.json"><code>slide_config.json</code></a>.
+<p>Much of the deck is customized by changing the settings in <a href="slide_config.js"><code>slide_config.js</code></a>.
 Some of the customizations include the title, Analytics tracking ID, speaker
 information (name, social urls, blog), web fonts to load, themes, and other
 general behavior.</p>
-<h3>Customizing the <code>#io2012</code> hash</h3>
-<p>The bottom of the slides include <code>#io2012</code> by default. If you'd like to change
-this, please update the variable <code>$social-tags: '#io2012';</code> in
+<h3>Customizing the <code>#io12</code> hash</h3>
+<p>The bottom of the slides include <code>#io12</code> by default. If you'd like to change
+this, please update the variable <code>$social-tags: '#io12';</code> in
 <a href="theme/scss/default.scss"><code>/theme/scss/default.scss</code></a>.</p>
 <p>See the next section on "Editing CSS" before you go editing things.</p>
 <h2>Editing CSS</h2>
@@ -102,4 +102,4 @@ from a popup window.</p>
 <p>To disable presenter mode, hit <a href="http://localhost:8000/template.html?presentme=false">http://localhost:8000/template.html?presentme=false</a></p>
 <p>Presenter mode is sticky, so refreshing the page will persist your settings.</p>
 <hr />
-<p>That's all she wrote!</p>
\ No newline at end of file
+<p>That's all she wrote!</p>
diff --git a/README.md b/README.md
index 34777da..1ba5391 100644
--- a/README.md
+++ b/README.md
@@ -50,15 +50,15 @@ pre {
 
 ## Configuring the slides
 
-Much of the deck is customized by changing the settings in [`slide_config.json`](slide_config.json).
+Much of the deck is customized by changing the settings in [`slide_config.js`](slide_config.js).
 Some of the customizations include the title, Analytics tracking ID, speaker
 information (name, social urls, blog), web fonts to load, themes, and other
 general behavior.
 
-### Customizing the `#io2012` hash
+### Customizing the `#io12` hash
 
-The bottom of the slides include `#io2012` by default. If you'd like to change
-this, please update the variable `$social-tags: '#io2012';` in
+The bottom of the slides include `#io12` by default. If you'd like to change
+this, please update the variable `$social-tags: '#io12';` in
 [`/theme/scss/default.scss`](theme/scss/default.scss).
 
 See the next section on "Editing CSS" before you go editing things.
diff --git a/app.yaml b/app.yaml
new file mode 100644
index 0000000..7692ab2
--- /dev/null
+++ b/app.yaml
@@ -0,0 +1,23 @@
+application: my-io-talk
+version: 1
+runtime: python27
+api_version: 1
+threadsafe: yes
+
+handlers:
+- url: /
+  static_files: template.html
+  upload: template\.html
+
+- url: /slide_config\.js
+  static_files: slide_config.js
+  upload: slide_config\.js
+
+- url: /js
+  static_dir: js
+
+- url: /theme
+  static_dir: theme
+
+- url: /images
+  static_dir: images
diff --git a/images/google_developers_logo_tiny.png b/images/google_developers_logo_tiny.png
new file mode 100644
index 0000000..6e607e4
Binary files /dev/null and b/images/google_developers_logo_tiny.png differ
diff --git a/js/order.js b/js/order.js
new file mode 100644
index 0000000..e78c183
--- /dev/null
+++ b/js/order.js
@@ -0,0 +1,8 @@
+/*
+ RequireJS order 1.0.5 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
+ Available via the MIT or new BSD license.
+ see: http://github.com/jrburke/requirejs for details
+*/
+(function(){function k(a){var b=a.currentTarget||a.srcElement,c;if(a.type==="load"||l.test(b.readyState)){a=b.getAttribute("data-requiremodule");j[a]=!0;for(a=0;c=g[a];a++)if(j[c.name])c.req([c.name],c.onLoad);else break;a>0&&g.splice(0,a);setTimeout(function(){b.parentNode.removeChild(b)},15)}}function m(a){var b,c;a.setAttribute("data-orderloaded","loaded");for(a=0;c=h[a];a++)if((b=i[c])&&b.getAttribute("data-orderloaded")==="loaded")delete i[c],require.addScriptToDom(b);else break;a>0&&h.splice(0,
+a)}var f=typeof document!=="undefined"&&typeof window!=="undefined"&&document.createElement("script"),n=f&&(f.async||window.opera&&Object.prototype.toString.call(window.opera)==="[object Opera]"||"MozAppearance"in document.documentElement.style),o=f&&f.readyState==="uninitialized",l=/^(complete|loaded)$/,g=[],j={},i={},h=[],f=null;define({version:"1.0.5",load:function(a,b,c,e){var d;b.nameToUrl?(d=b.nameToUrl(a,null),require.s.skipAsync[d]=!0,n||e.isBuild?b([a],c):o?(e=require.s.contexts._,!e.urlFetched[d]&&
+!e.loaded[a]&&(e.urlFetched[d]=!0,require.resourcesReady(!1),e.scriptCount+=1,d=require.attach(d,e,a,null,null,m),i[a]=d,h.push(a)),b([a],c)):b.specified(a)?b([a],c):(g.push({name:a,req:b,onLoad:c}),require.attach(d,null,a,k,"script/cache"))):b([a],c)}})})();
diff --git a/js/polyfills/bind.js b/js/polyfills/bind.js
deleted file mode 100644
index fe6bc0d..0000000
--- a/js/polyfills/bind.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Function.bind polyfill for Safari < 5.1.4 and iOS.
-// From https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Function/bind
-Function.prototype.bind||(Function.prototype.bind=function(c){if("function"!==typeof this)throw new TypeError("Function.prototype.bind - binding an object that is not callable");var d=Array.prototype.slice.call(arguments,1),e=this,a=function(){},b=function(){return e.apply(this instanceof a?this:c||window,d.concat(Array.prototype.slice.call(arguments)))};a.prototype=this.prototype;b.prototype=new a;return b});
diff --git a/js/polyfills/matchMedia.js b/js/polyfills/matchMedia.js
deleted file mode 100644
index 6d4d17c..0000000
--- a/js/polyfills/matchMedia.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*! matchMedia() polyfill - Test a CSS media type/query in JS. Authors & copyright (c) 2012: Scott Jehl, Paul Irish, Nicholas Zakas. Dual MIT/BSD license */
-
-window.matchMedia = window.matchMedia || (function(doc, undefined){
-
-  var bool,
-      docElem  = doc.documentElement,
-      refNode  = docElem.firstElementChild || docElem.firstChild,
-      // fakeBody required for <FF4 when executed in <head>
-      fakeBody = doc.createElement('body'),
-      div      = doc.createElement('div');
-
-  div.id = 'mq-test-1';
-  div.style.cssText = "position:absolute;top:-100em";
-  fakeBody.style.background = "none";
-  fakeBody.appendChild(div);
-
-  return function(q){
-
-    div.innerHTML = '&shy;<style media="'+q+'"> #mq-test-1 { width: 42px; }</style>';
-
-    docElem.insertBefore(fakeBody, refNode);
-    bool = div.offsetWidth == 42;
-    docElem.removeChild(fakeBody);
-
-    return { matches: bool, media: q };
-  };
-
-})(document);
-
-
diff --git a/js/require-1.0.8.min.js b/js/require-1.0.8.min.js
new file mode 100644
index 0000000..162cd9a
--- /dev/null
+++ b/js/require-1.0.8.min.js
@@ -0,0 +1,33 @@
+/*
+ RequireJS 1.0.8 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
+ Available via the MIT or new BSD license.
+ see: http://github.com/jrburke/requirejs for details
+*/
+var requirejs,require,define;
+(function(r){function K(a){return O.call(a)==="[object Function]"}function G(a){return O.call(a)==="[object Array]"}function $(a,c,l){for(var j in c)if(!(j in L)&&(!(j in a)||l))a[j]=c[j];return d}function P(a,c,d){a=Error(c+"\nhttp://requirejs.org/docs/errors.html#"+a);if(d)a.originalError=d;return a}function aa(a,c,d){var j,k,t;for(j=0;t=c[j];j++){t=typeof t==="string"?{name:t}:t;k=t.location;if(d&&(!k||k.indexOf("/")!==0&&k.indexOf(":")===-1))k=d+"/"+(k||t.name);a[t.name]={name:t.name,location:k||
+t.name,main:(t.main||"main").replace(fa,"").replace(ba,"")}}}function V(a,c){a.holdReady?a.holdReady(c):c?a.readyWait+=1:a.ready(!0)}function ga(a){function c(b,f){var g,m;if(b&&b.charAt(0)===".")if(f){q.pkgs[f]?f=[f]:(f=f.split("/"),f=f.slice(0,f.length-1));g=b=f.concat(b.split("/"));var a;for(m=0;a=g[m];m++)if(a===".")g.splice(m,1),m-=1;else if(a==="..")if(m===1&&(g[2]===".."||g[0]===".."))break;else m>0&&(g.splice(m-1,2),m-=2);m=q.pkgs[g=b[0]];b=b.join("/");m&&b===g+"/"+m.main&&(b=g)}else b.indexOf("./")===
+0&&(b=b.substring(2));return b}function l(b,f){var g=b?b.indexOf("!"):-1,m=null,a=f?f.name:null,h=b,e,d;g!==-1&&(m=b.substring(0,g),b=b.substring(g+1,b.length));m&&(m=c(m,a));b&&(m?e=(g=n[m])&&g.normalize?g.normalize(b,function(b){return c(b,a)}):c(b,a):(e=c(b,a),d=G[e],d||(d=i.nameToUrl(b,null,f),G[e]=d)));return{prefix:m,name:e,parentMap:f,url:d,originalName:h,fullName:m?m+"!"+(e||""):e}}function j(){var b=!0,f=q.priorityWait,g,a;if(f){for(a=0;g=f[a];a++)if(!s[g]){b=!1;break}b&&delete q.priorityWait}return b}
+function k(b,f,g){return function(){var a=ha.call(arguments,0),c;if(g&&K(c=a[a.length-1]))c.__requireJsBuild=!0;a.push(f);return b.apply(null,a)}}function t(b,f,g){f=k(g||i.require,b,f);$(f,{nameToUrl:k(i.nameToUrl,b),toUrl:k(i.toUrl,b),defined:k(i.requireDefined,b),specified:k(i.requireSpecified,b),isBrowser:d.isBrowser});return f}function p(b){var f,g,a,c=b.callback,h=b.map,e=h.fullName,ca=b.deps;a=b.listeners;var j=q.requireExecCb||d.execCb;if(c&&K(c)){if(q.catchError.define)try{g=j(e,b.callback,
+ca,n[e])}catch(k){f=k}else g=j(e,b.callback,ca,n[e]);if(e)(c=b.cjsModule)&&c.exports!==r&&c.exports!==n[e]?g=n[e]=b.cjsModule.exports:g===r&&b.usingExports?g=n[e]:(n[e]=g,H[e]&&(T[e]=!0))}else e&&(g=n[e]=c,H[e]&&(T[e]=!0));if(x[b.id])delete x[b.id],b.isDone=!0,i.waitCount-=1,i.waitCount===0&&(J=[]);delete M[e];if(d.onResourceLoad&&!b.placeholder)d.onResourceLoad(i,h,b.depArray);if(f)return g=(e?l(e).url:"")||f.fileName||f.sourceURL,a=f.moduleTree,f=P("defineerror",'Error evaluating module "'+e+'" at location "'+
+g+'":\n'+f+"\nfileName:"+g+"\nlineNumber: "+(f.lineNumber||f.line),f),f.moduleName=e,f.moduleTree=a,d.onError(f);for(f=0;c=a[f];f++)c(g);return r}function u(b,f){return function(g){b.depDone[f]||(b.depDone[f]=!0,b.deps[f]=g,b.depCount-=1,b.depCount||p(b))}}function o(b,f){var g=f.map,a=g.fullName,c=g.name,h=N[b]||(N[b]=n[b]),e;if(!f.loading)f.loading=!0,e=function(b){f.callback=function(){return b};p(f);s[f.id]=!0;A()},e.fromText=function(b,f){var g=Q;s[b]=!1;i.scriptCount+=1;i.fake[b]=!0;g&&(Q=!1);
+d.exec(f);g&&(Q=!0);i.completeLoad(b)},a in n?e(n[a]):h.load(c,t(g.parentMap,!0,function(b,a){var c=[],e,m;for(e=0;m=b[e];e++)m=l(m,g.parentMap),b[e]=m.fullName,m.prefix||c.push(b[e]);f.moduleDeps=(f.moduleDeps||[]).concat(c);return i.require(b,a)}),e,q)}function y(b){x[b.id]||(x[b.id]=b,J.push(b),i.waitCount+=1)}function D(b){this.listeners.push(b)}function v(b,f){var g=b.fullName,a=b.prefix,c=a?N[a]||(N[a]=n[a]):null,h,e;g&&(h=M[g]);if(!h&&(e=!0,h={id:(a&&!c?O++ +"__p@:":"")+(g||"__r@"+O++),map:b,
+depCount:0,depDone:[],depCallbacks:[],deps:[],listeners:[],add:D},B[h.id]=!0,g&&(!a||N[a])))M[g]=h;a&&!c?(g=l(a),a in n&&!n[a]&&(delete n[a],delete R[g.url]),a=v(g,!0),a.add(function(){var f=l(b.originalName,b.parentMap),f=v(f,!0);h.placeholder=!0;f.add(function(b){h.callback=function(){return b};p(h)})})):e&&f&&(s[h.id]=!1,i.paused.push(h),y(h));return h}function C(b,f,a,c){var b=l(b,c),d=b.name,h=b.fullName,e=v(b),j=e.id,k=e.deps,o;if(h){if(h in n||s[j]===!0||h==="jquery"&&q.jQuery&&q.jQuery!==
+a().fn.jquery)return;B[j]=!0;s[j]=!0;h==="jquery"&&a&&W(a())}e.depArray=f;e.callback=a;for(a=0;a<f.length;a++)if(j=f[a])j=l(j,d?b:c),o=j.fullName,f[a]=o,o==="require"?k[a]=t(b):o==="exports"?(k[a]=n[h]={},e.usingExports=!0):o==="module"?e.cjsModule=k[a]={id:d,uri:d?i.nameToUrl(d,null,c):r,exports:n[h]}:o in n&&!(o in x)&&(!(h in H)||h in H&&T[o])?k[a]=n[o]:(h in H&&(H[o]=!0,delete n[o],R[j.url]=!1),e.depCount+=1,e.depCallbacks[a]=u(e,a),v(j,!0).add(e.depCallbacks[a]));e.depCount?y(e):p(e)}function w(b){C.apply(null,
+b)}function F(b,f){var a=b.map.fullName,c=b.depArray,d=!0,h,e,i,l;if(b.isDone||!a||!s[a])return l;if(f[a])return b;f[a]=!0;if(c){for(h=0;h<c.length;h++){e=c[h];if(!s[e]&&!ia[e]){d=!1;break}if((i=x[e])&&!i.isDone&&s[e])if(l=F(i,f))break}d||(l=r,delete f[a])}return l}function z(b,a){var g=b.map.fullName,c=b.depArray,d,h,e,i;if(b.isDone||!g||!s[g])return r;if(g){if(a[g])return n[g];a[g]=!0}if(c)for(d=0;d<c.length;d++)if(h=c[d])if((e=l(h).prefix)&&(i=x[e])&&z(i,a),(e=x[h])&&!e.isDone&&s[h])h=z(e,a),b.depCallbacks[d](h);
+return n[g]}function E(){var b=q.waitSeconds*1E3,b=b&&i.startTime+b<(new Date).getTime(),a="",c=!1,l=!1,k=[],h,e;if(i.pausedCount>0)return r;if(q.priorityWait)if(j())A();else return r;for(h in s)if(!(h in L)&&(c=!0,!s[h]))if(b)a+=h+" ";else if(l=!0,h.indexOf("!")===-1){k=[];break}else(e=M[h]&&M[h].moduleDeps)&&k.push.apply(k,e);if(!c&&!i.waitCount)return r;if(b&&a)return b=P("timeout","Load timeout for modules: "+a),b.requireType="timeout",b.requireModules=a,b.contextName=i.contextName,d.onError(b);
+if(l&&k.length)for(a=0;h=x[k[a]];a++)if(h=F(h,{})){z(h,{});break}if(!b&&(l||i.scriptCount)){if((I||da)&&!X)X=setTimeout(function(){X=0;E()},50);return r}if(i.waitCount){for(a=0;h=J[a];a++)z(h,{});i.paused.length&&A();Y<5&&(Y+=1,E())}Y=0;d.checkReadyState();return r}var i,A,q={waitSeconds:7,baseUrl:"./",paths:{},pkgs:{},catchError:{}},S=[],B={require:!0,exports:!0,module:!0},G={},n={},s={},x={},J=[],R={},O=0,M={},N={},H={},T={},Z=0;W=function(b){if(!i.jQuery&&(b=b||(typeof jQuery!=="undefined"?jQuery:
+null))&&!(q.jQuery&&b.fn.jquery!==q.jQuery)&&("holdReady"in b||"readyWait"in b))if(i.jQuery=b,w(["jquery",[],function(){return jQuery}]),i.scriptCount)V(b,!0),i.jQueryIncremented=!0};A=function(){var b,a,c,l,k,h;i.takeGlobalQueue();Z+=1;if(i.scriptCount<=0)i.scriptCount=0;for(;S.length;)if(b=S.shift(),b[0]===null)return d.onError(P("mismatch","Mismatched anonymous define() module: "+b[b.length-1]));else w(b);if(!q.priorityWait||j())for(;i.paused.length;){k=i.paused;i.pausedCount+=k.length;i.paused=
+[];for(l=0;b=k[l];l++)a=b.map,c=a.url,h=a.fullName,a.prefix?o(a.prefix,b):!R[c]&&!s[h]&&((q.requireLoad||d.load)(i,h,c),c.indexOf("empty:")!==0&&(R[c]=!0));i.startTime=(new Date).getTime();i.pausedCount-=k.length}Z===1&&E();Z-=1;return r};i={contextName:a,config:q,defQueue:S,waiting:x,waitCount:0,specified:B,loaded:s,urlMap:G,urlFetched:R,scriptCount:0,defined:n,paused:[],pausedCount:0,plugins:N,needFullExec:H,fake:{},fullExec:T,managerCallbacks:M,makeModuleMap:l,normalize:c,configure:function(b){var a,
+c,d;b.baseUrl&&b.baseUrl.charAt(b.baseUrl.length-1)!=="/"&&(b.baseUrl+="/");a=q.paths;d=q.pkgs;$(q,b,!0);if(b.paths){for(c in b.paths)c in L||(a[c]=b.paths[c]);q.paths=a}if((a=b.packagePaths)||b.packages){if(a)for(c in a)c in L||aa(d,a[c],c);b.packages&&aa(d,b.packages);q.pkgs=d}if(b.priority)c=i.requireWait,i.requireWait=!1,A(),i.require(b.priority),A(),i.requireWait=c,q.priorityWait=b.priority;if(b.deps||b.callback)i.require(b.deps||[],b.callback)},requireDefined:function(b,a){return l(b,a).fullName in
+n},requireSpecified:function(b,a){return l(b,a).fullName in B},require:function(b,c,g){if(typeof b==="string"){if(K(c))return d.onError(P("requireargs","Invalid require call"));if(d.get)return d.get(i,b,c);c=l(b,c);b=c.fullName;return!(b in n)?d.onError(P("notloaded","Module name '"+c.fullName+"' has not been loaded yet for context: "+a)):n[b]}(b&&b.length||c)&&C(null,b,c,g);if(!i.requireWait)for(;!i.scriptCount&&i.paused.length;)A();return i.require},takeGlobalQueue:function(){U.length&&(ja.apply(i.defQueue,
+[i.defQueue.length-1,0].concat(U)),U=[])},completeLoad:function(b){var a;for(i.takeGlobalQueue();S.length;)if(a=S.shift(),a[0]===null){a[0]=b;break}else if(a[0]===b)break;else w(a),a=null;a?w(a):w([b,[],b==="jquery"&&typeof jQuery!=="undefined"?function(){return jQuery}:null]);d.isAsync&&(i.scriptCount-=1);A();d.isAsync||(i.scriptCount-=1)},toUrl:function(b,a){var c=b.lastIndexOf("."),d=null;c!==-1&&(d=b.substring(c,b.length),b=b.substring(0,c));return i.nameToUrl(b,d,a)},nameToUrl:function(b,a,g){var l,
+k,h,e,j=i.config,b=c(b,g&&g.fullName);if(d.jsExtRegExp.test(b))a=b+(a?a:"");else{l=j.paths;k=j.pkgs;g=b.split("/");for(e=g.length;e>0;e--)if(h=g.slice(0,e).join("/"),l[h]){g.splice(0,e,l[h]);break}else if(h=k[h]){b=b===h.name?h.location+"/"+h.main:h.location;g.splice(0,e,b);break}a=g.join("/")+(a||".js");a=(a.charAt(0)==="/"||a.match(/^[\w\+\.\-]+:/)?"":j.baseUrl)+a}return j.urlArgs?a+((a.indexOf("?")===-1?"?":"&")+j.urlArgs):a}};i.jQueryCheck=W;i.resume=A;return i}function ka(){var a,c,d;if(C&&C.readyState===
+"interactive")return C;a=document.getElementsByTagName("script");for(c=a.length-1;c>-1&&(d=a[c]);c--)if(d.readyState==="interactive")return C=d;return null}var la=/(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,ma=/require\(\s*["']([^'"\s]+)["']\s*\)/g,fa=/^\.\//,ba=/\.js$/,O=Object.prototype.toString,u=Array.prototype,ha=u.slice,ja=u.splice,I=!!(typeof window!=="undefined"&&navigator&&document),da=!I&&typeof importScripts!=="undefined",na=I&&navigator.platform==="PLAYSTATION 3"?/^complete$/:/^(complete|loaded)$/,
+ea=typeof opera!=="undefined"&&opera.toString()==="[object Opera]",L={},D={},U=[],C=null,Y=0,Q=!1,ia={require:!0,module:!0,exports:!0},d,u={},J,y,v,E,o,w,F,B,z,W,X;if(typeof define==="undefined"){if(typeof requirejs!=="undefined")if(K(requirejs))return;else u=requirejs,requirejs=r;typeof require!=="undefined"&&!K(require)&&(u=require,require=r);d=requirejs=function(a,c,d){var j="_",k;!G(a)&&typeof a!=="string"&&(k=a,G(c)?(a=c,c=d):a=[]);if(k&&k.context)j=k.context;d=D[j]||(D[j]=ga(j));k&&d.configure(k);
+return d.require(a,c)};d.config=function(a){return d(a)};require||(require=d);d.toUrl=function(a){return D._.toUrl(a)};d.version="1.0.8";d.jsExtRegExp=/^\/|:|\?|\.js$/;y=d.s={contexts:D,skipAsync:{}};if(d.isAsync=d.isBrowser=I)if(v=y.head=document.getElementsByTagName("head")[0],E=document.getElementsByTagName("base")[0])v=y.head=E.parentNode;d.onError=function(a){throw a;};d.load=function(a,c,l){d.resourcesReady(!1);a.scriptCount+=1;d.attach(l,a,c);if(a.jQuery&&!a.jQueryIncremented)V(a.jQuery,!0),
+a.jQueryIncremented=!0};define=function(a,c,d){var j,k;typeof a!=="string"&&(d=c,c=a,a=null);G(c)||(d=c,c=[]);!c.length&&K(d)&&d.length&&(d.toString().replace(la,"").replace(ma,function(a,d){c.push(d)}),c=(d.length===1?["require"]:["require","exports","module"]).concat(c));if(Q&&(j=J||ka()))a||(a=j.getAttribute("data-requiremodule")),k=D[j.getAttribute("data-requirecontext")];(k?k.defQueue:U).push([a,c,d]);return r};define.amd={multiversion:!0,plugins:!0,jQuery:!0};d.exec=function(a){return eval(a)};
+d.execCb=function(a,c,d,j){return c.apply(j,d)};d.addScriptToDom=function(a){J=a;E?v.insertBefore(a,E):v.appendChild(a);J=null};d.onScriptLoad=function(a){var c=a.currentTarget||a.srcElement,l;if(a.type==="load"||c&&na.test(c.readyState))C=null,a=c.getAttribute("data-requirecontext"),l=c.getAttribute("data-requiremodule"),D[a].completeLoad(l),c.detachEvent&&!ea?c.detachEvent("onreadystatechange",d.onScriptLoad):c.removeEventListener("load",d.onScriptLoad,!1)};d.attach=function(a,c,l,j,k,o){var p;
+if(I)return j=j||d.onScriptLoad,p=c&&c.config&&c.config.xhtml?document.createElementNS("http://www.w3.org/1999/xhtml","html:script"):document.createElement("script"),p.type=k||c&&c.config.scriptType||"text/javascript",p.charset="utf-8",p.async=!y.skipAsync[a],c&&p.setAttribute("data-requirecontext",c.contextName),p.setAttribute("data-requiremodule",l),p.attachEvent&&!(p.attachEvent.toString&&p.attachEvent.toString().indexOf("[native code]")<0)&&!ea?(Q=!0,o?p.onreadystatechange=function(){if(p.readyState===
+"loaded")p.onreadystatechange=null,p.attachEvent("onreadystatechange",j),o(p)}:p.attachEvent("onreadystatechange",j)):p.addEventListener("load",j,!1),p.src=a,o||d.addScriptToDom(p),p;else da&&(importScripts(a),c.completeLoad(l));return null};if(I){o=document.getElementsByTagName("script");for(B=o.length-1;B>-1&&(w=o[B]);B--){if(!v)v=w.parentNode;if(F=w.getAttribute("data-main")){if(!u.baseUrl)o=F.split("/"),w=o.pop(),o=o.length?o.join("/")+"/":"./",u.baseUrl=o,F=w.replace(ba,"");u.deps=u.deps?u.deps.concat(F):
+[F];break}}}d.checkReadyState=function(){var a=y.contexts,c;for(c in a)if(!(c in L)&&a[c].waitCount)return;d.resourcesReady(!0)};d.resourcesReady=function(a){var c,l;d.resourcesDone=a;if(d.resourcesDone)for(l in a=y.contexts,a)if(!(l in L)&&(c=a[l],c.jQueryIncremented))V(c.jQuery,!1),c.jQueryIncremented=!1};d.pageLoaded=function(){if(document.readyState!=="complete")document.readyState="complete"};if(I&&document.addEventListener&&!document.readyState)document.readyState="loading",window.addEventListener("load",
+d.pageLoaded,!1);d(u);if(d.isAsync&&typeof setTimeout!=="undefined")z=y.contexts[u.context||"_"],z.requireWait=!0,setTimeout(function(){z.requireWait=!1;z.scriptCount||z.resume();d.checkReadyState()},0)}})();
diff --git a/js/slide-controller.js b/js/slide-controller.js
index 84388a9..571317b 100644
--- a/js/slide-controller.js
+++ b/js/slide-controller.js
@@ -72,7 +72,7 @@ SlideController.prototype.onMessage_ = function(e) {
   // Restrict messages to being from this origin. Allow local developmet
   // from file:// though.
   // TODO: It would be dope if FF implemented location.origin!
-  if (e.origin != ORIGIN_ && ORIGIN_ != 'file://') {
+  if (e.origin != ORIGIN_ && ORIGIN_.indexOf('file://') != 0) {
     alert('Someone tried to postMessage from an unknown origin');
     return;
   }
diff --git a/js/slide-deck.js b/js/slide-deck.js
index a5308b9..50b9dc5 100644
--- a/js/slide-deck.js
+++ b/js/slide-deck.js
@@ -1,5 +1,6 @@
 /**
- * @authors TODO
+ * @authors Luke Mahe
+ * @authors Eric Bidelman
  * @fileoverview TODO
  */
 document.cancelFullScreen = document.webkitCancelFullScreen ||
@@ -48,6 +49,16 @@ SlideDeck.prototype.getCurrentSlideFromHash_ = function() {
   }
 };
 
+/**
+ * @param {number} slideNo
+ */
+SlideDeck.prototype.loadSlide = function(slideNo) {
+  if (slideNo) {
+    this.curSlide_ = slideNo - 1;
+    this.updateSlides_();
+  }
+};
+
 /**
  * @private
  */
@@ -73,9 +84,20 @@ SlideDeck.prototype.onDomLoaded_ = function(e) {
   this.updateSlides_();
 
   // Add slide numbers and total slide count metadata to each slide.
+  var that = this;
   for (var i = 0, slide; slide = this.slides[i]; ++i) {
     slide.dataset.slideNum = i + 1;
     slide.dataset.totalSlides = this.slides.length;
+
+    slide.addEventListener('click', function(e) {
+      if (document.body.classList.contains('overview')) {
+        that.loadSlide(this.dataset.slideNum);
+        e.preventDefault();
+        window.setTimeout(function() {
+          that.toggleOverview();
+        }, 500);
+      }
+    }, false);
   }
 
   // Note: this needs to come after addEventListeners_(), which adds a
@@ -152,6 +174,12 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
   }
 
   switch (e.keyCode) {
+    case 13: // Enter
+      if (document.body.classList.contains('overview')) {
+        this.toggleOverview();
+      }
+      break;
+
     case 39: // right arrow
     case 32: // space
     case 34: // PgDn
@@ -167,20 +195,12 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
       break;
 
     case 40: // down arrow
-      //if (this.isChromeVoxActive()) {
-      //  speakNextItem();
-      //} else {
-        this.nextSlide();
-      //}
+      this.nextSlide();
       e.preventDefault();
       break;
 
     case 38: // up arrow
-      //if (this.isChromeVoxActive()) {
-      //  speakPrevItem();
-      //} else {
-        this.prevSlide();
-      //}
+      this.prevSlide();
       e.preventDefault();
       break;
 
@@ -188,6 +208,10 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
       document.body.classList.toggle('highlight-code');
       break;
 
+    case 79: // O: Toggle overview
+      this.toggleOverview();
+      break;
+
     case 80: // P
       if (this.controller && this.controller.isPopup) {
         document.body.classList.toggle('with-notes');
@@ -203,6 +227,10 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
     case 27: // ESC: Hide notes and highlighting
       document.body.classList.remove('with-notes');
       document.body.classList.remove('highlight-code');
+
+      if (document.body.classList.contains('overview')) {
+        this.toggleOverview();
+      }
       break;
 
     case 70: // F: Toggle fullscreen
@@ -229,6 +257,27 @@ SlideDeck.prototype.onBodyKeyDown_ = function(e) {
   }
 };
 
+/**
+ *
+ */
+SlideDeck.prototype.focusOverview_ = function() {
+  var overview = document.body.classList.contains('overview');
+
+  for (var i = 0, slide; slide = this.slides[i]; i++) {
+    slide.style[Modernizr.prefixed('transform')] = overview ?
+        'translateZ(-2500px) translate(' + (( i - this.curSlide_ ) * 105) +
+                                       '%, 0%)' : '';
+  }
+};
+
+/**
+ */
+SlideDeck.prototype.toggleOverview = function() {
+  document.body.classList.toggle('overview');
+
+  this.focusOverview_();
+};
+
 /**
  * @private
  */
@@ -276,34 +325,46 @@ SlideDeck.prototype.loadConfig_ = function(config) {
 
   if (this.config_.presenters) {
     var presenters = this.config_.presenters;
+    var dataConfigContact = document.querySelector('[data-config-contact]');
 
     var html = [];
     if (presenters.length == 1) {
-      var p = presenters[0]
+      var p = presenters[0];
 
       html = [p.name, p.company].join('<br>');
 
       var gplus = p.gplus ? '<span>g+</span><a href="' + p.gplus +
-                            '">' + p.gplus.replace('http://', '') + '</a>' : '';
+          '">' + p.gplus.replace(/https?:\/\//, '') + '</a>' : '';
 
       var twitter = p.twitter ? '<span>twitter</span>' +
           '<a href="http://twitter.com/' + p.twitter + '">' +
           p.twitter + '</a>' : '';
 
-     var www = p.www ? '<span>www</span><a href="' + p.www +
-                       '">' + p.www.replace('http://', '') + '</a>' : '';
+      var www = p.www ? '<span>www</span><a href="' + p.www +
+                        '">' + p.www.replace(/https?:\/\//, '') + '</a>' : '';
 
-      var html2 = [gplus, twitter, www].join('<br>');
+      var github = p.github ? '<span>github</span><a href="' + p.github +
+          '">' + p.github.replace(/https?:\/\//, '') + '</a>' : '';
 
-      document.querySelector('[data-config-contact]').innerHTML = html2;
+      var html2 = [gplus, twitter, www, github].join('<br>');
+
+      if (dataConfigContact) {
+        dataConfigContact.innerHTML = html2;
+      }
     } else {
       for (var i = 0, p; p = presenters[i]; ++i) {
         html.push(p.name + ' - ' + p.company);
       }
       html = html.join('<br>');
+      if (dataConfigContact) {
+        dataConfigContact.innerHTML = html;
+      }
     }
 
-    document.querySelector('[data-config-presenter]').innerHTML = html;
+    var dataConfigPresenter = document.querySelector('[data-config-presenter]');
+    if (dataConfigPresenter) {
+      document.querySelector('[data-config-presenter]').innerHTML = html;
+    }
   }
 
   /* Left/Right tap areas. Default to including. */
@@ -349,7 +410,8 @@ SlideDeck.prototype.loadConfig_ = function(config) {
 SlideDeck.prototype.addFonts_ = function(fonts) {
   var el = document.createElement('link');
   el.rel = 'stylesheet';
-  el.href = 'http://fonts.googleapis.com/css?family=' + fonts.join('|') + '&v2';
+  el.href = ('https:' == document.location.protocol ? 'https' : 'http') +
+      '://fonts.googleapis.com/css?family=' + fonts.join('|') + '&v2';
   document.querySelector('head').appendChild(el);
 };
 
@@ -379,10 +441,6 @@ SlideDeck.prototype.buildNextItem_ = function() {
   toBuild.classList.remove('to-build');
   toBuild.classList.add('build-current');
 
-  /*if (isChromeVoxActive()) {
-    speakAndSyncToNode(toBuild);
-  }*/
-
   return true;
 };
 
@@ -412,7 +470,7 @@ SlideDeck.prototype.prevSlide = function(opt_dontPush) {
  * @param {boolean=} opt_dontPush
  */
 SlideDeck.prototype.nextSlide = function(opt_dontPush) {
-  if (this.buildNextItem_()) {
+  if (!document.body.classList.contains('overview') && this.buildNextItem_()) {
     return;
   }
 
@@ -510,11 +568,13 @@ SlideDeck.prototype.updateSlides_ = function(opt_dontPush) {
    // Give ourselves a good buffer to preload the next slide's iframes.
    window.setTimeout(this.enableSlideFrames_.bind(this, curSlide + 2), 1000);
 
-  /*if (isChromeVoxActive()) {
-    speakAndSyncToNode(slideEls[curSlide]);
-  }*/
-
   this.updateHash_(dontPush);
+
+  if (document.body.classList.contains('overview')) {
+    this.focusOverview_();
+    return;
+  }
+
 };
 
 /**
diff --git a/js/slides.js b/js/slides.js
index 1af4bd5..3f6306e 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -1,15 +1,5 @@
-/**
- * ADD stuff here
- */
-(function() {
-  var scs = ['modernizr.custom.45394.js', 'prettify/prettify.js', 'hammer.js',
-      'slide-controller.js', 'slide-deck.js'];
-  var b = document.getElementsByTagName('script')[0];
-  for (var i = 0, s; s = scs[i]; i++) {
-    var sc = document.createElement('script');
-    sc.type = 'text/javascript';
-    sc.async = true;
-    sc.src = 'js/' + s;
-    b.parentNode.insertBefore(sc, b);
-  }
-})();
+require(['order!../slide_config', 'order!modernizr.custom.45394',
+         'order!prettify/prettify', 'order!hammer', 'order!slide-controller',
+         'order!slide-deck'], function(someModule) {
+
+});
diff --git a/scripts/md/README.md b/scripts/md/README.md
new file mode 100644
index 0000000..136e465
--- /dev/null
+++ b/scripts/md/README.md
@@ -0,0 +1,5 @@
+Want to use markdown instead?
+
+`python render.py` can do that for you.
+
+Dependencies: jinja2, markdown.
diff --git a/scripts/md/base.html b/scripts/md/base.html
new file mode 100644
index 0000000..a469806
--- /dev/null
+++ b/scripts/md/base.html
@@ -0,0 +1,66 @@
+<!--
+Google IO 2012 HTML5 Slide Template
+
+Authors: Eric Bidelman <ebidel@gmail.com>
+         Luke Mahe <lukem@google.com>
+
+URL: https://code.google.com/p/io-2012-slides
+-->
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Google IO 2012</title>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="chrome=1">
+  <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->
+  <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">-->
+  <!--This one seems to work all the time, but really small on ipad-->
+  <!--<meta name="viewport" content="initial-scale=0.4">-->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <link rel="stylesheet" media="all" href="theme/css/default.css">
+  <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css">
+  <base target="_blank"> <!-- This amazingness opens all links in a new tab. -->
+  <script data-main="js/slides" src="js/require-1.0.8.min.js"></script>
+</head>
+<body style="opacity: 0">
+
+<slides class="layout-widescreen">
+
+<slide class="logoslide nobackground">
+  <article class="flexbox vcenter">
+    <span><img src="images/google_developers_logo.png"></span>
+  </article>
+</slide>
+
+<slide class="title-slide segue nobackground">
+  <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside>
+  <!-- The content of this hgroup is replaced programmatically through the slide_config.json. -->
+  <hgroup class="auto-fadein">
+    <h1 data-config-title><!-- populated from slide_config.json --></h1>
+    <h2 data-config-subtitle><!-- populated from slide_config.json --></h2>
+    <p data-config-presenter><!-- populated from slide_config.json --></p>
+  </hgroup>
+</slide>
+
+{% for slide in slides %}
+<slide class="{{ slide.class }}">
+  <hgroup>
+    <h1>{{ slide.h1 }}</h1>
+    <h2>{{ slide.title }}</h2>
+  </hgroup>
+  <article>
+  {{ slide.content }}
+  </article>
+</slide>
+{% endfor %}
+
+<slide class="backdrop"></slide>
+
+</slides>
+
+<!--[if IE]>
+  <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
+  <script>CFInstall.check({mode: 'overlay'});</script>
+<![endif]-->
+</body>
+</html>
diff --git a/scripts/md/render.py b/scripts/md/render.py
new file mode 100755
index 0000000..c634ea0
--- /dev/null
+++ b/scripts/md/render.py
@@ -0,0 +1,53 @@
+#!/opt/local/Library/Frameworks/Python.framework/Versions/2.7/bin/python
+import codecs
+import re
+import jinja2
+import markdown
+
+def process_slides():
+  with codecs.open('../presentation.html', 'w', encoding='utf8') as outfile:
+    md = codecs.open('slides.md', encoding='utf8').read()
+    md_slides = md.split('\n---\n')
+    print len(md_slides)
+
+    slides = []
+    # Process each slide separately.
+    for md_slide in md_slides:
+      slide = {}
+      sections = md_slide.split('\n\n')
+      # Extract metadata at the beginning of the slide (look for key: value)
+      # pairs.
+      metadata_section = sections[0]
+      metadata = parse_metadata(metadata_section)
+      slide.update(metadata)
+      remainder_index = metadata and 1 or 0
+      # Get the content from the rest of the slide.
+      content_section = '\n\n'.join(sections[remainder_index:])
+      html = markdown.markdown(content_section)
+      slide['content'] = postprocess_html(html, markdown)
+
+      slides.append(slide)
+
+    template = jinja2.Template(open('base.html').read())
+
+    outfile.write(template.render(locals()))
+
+def parse_metadata(section):
+  """Given the first part of a slide, returns metadata associated with it."""
+  metadata = {}
+  metadata_lines = section.split('\n')
+  for line in metadata_lines:
+    colon_index = line.find(':')
+    if colon_index != -1:
+      key = line[:colon_index].strip()
+      val = line[colon_index + 1:].strip()
+      metadata[key] = val
+
+  return metadata
+
+def postprocess_html(html, metadata):
+  """Returns processed HTML to fit into the slide template format."""
+  return html
+
+if __name__ == '__main__':
+  process_slides()
diff --git a/scripts/md/slides.md b/scripts/md/slides.md
new file mode 100644
index 0000000..064b8db
--- /dev/null
+++ b/scripts/md/slides.md
@@ -0,0 +1,64 @@
+title: Slide Title
+class: image
+
+![Mobile vs desktop users](image.png)
+
+---
+
+title: Agenda
+class: big
+
+Things we'll cover:
+
+- Bullet1
+- Bullet2
+- Bullet3
+
+---
+
+title: Today
+class: nobackground fill
+
+![Many kinds of devices.](image.png)
+
+<footer class="source">source: place source info here</footer>
+
+---
+
+h1: Big Title Slide
+class: title-slide
+
+---
+
+title: Code Example
+
+Media Queries are sweet:
+
+<pre class="prettyprint" data-lang="css">
+@media screen and (max-width: 640px) {
+  #sidebar { display: none; }
+}
+</pre>
+
+---
+
+title: Once more, with JavaScript
+
+<pre class="prettyprint" data-lang="javascript">
+function isSmall() {
+  return window.matchMedia("(min-device-width: ???)").matches;
+}
+
+function hasTouch() {
+  return Modernizr.touch;
+}
+
+function detectFormFactor() {
+  var device = DESKTOP;
+  if (hasTouch()) {
+    device = isSmall() ? PHONE : TABLET;
+  }
+  return device;
+}
+</pre>
+
diff --git a/serve.sh b/serve.sh
index 9663bad..f2692fe 100755
--- a/serve.sh
+++ b/serve.sh
@@ -12,4 +12,11 @@ then
   port=8000
 fi
 
-open http://localhost:$port/template.html && python -m SimpleHTTPServer $port;
+if [ $(uname -s) == "Darwin" ]
+then
+  open=open
+else
+  open=xdg-open
+fi
+
+$open http://localhost:$port/template.html && python -m SimpleHTTPServer $port;
diff --git a/slide_config.js b/slide_config.js
new file mode 100644
index 0000000..1389ab3
--- /dev/null
+++ b/slide_config.js
@@ -0,0 +1,36 @@
+var SLIDE_CONFIG = {
+  // Slide settings
+  settings: {
+    title: 'Title Goes Here<br>Up To Two Lines',
+    subtitle: 'Subtitle Goes Here',
+    useBuilds: true, // Default: true. False will turn off slide animation builds.
+    usePrettify: true, // Default: true
+    enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides.
+    enableTouch: true, // Default: true. If touch support should enabled. Note: the device must support touch.
+    //analytics: 'UA-XXXXXXXX-1', // TODO: Using this breaks GA for some reason (probably requirejs). Update your tracking code in template.html instead.
+    favIcon: 'images/google_developers_logo_tiny.png',
+    fonts: [
+      'Open Sans:regular,semibold,italic,italicsemibold',
+      'Inconsolata'
+    ],
+    //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension.
+  },
+
+  // Author information
+  presenters: [{
+    name: 'Firstname Lastname',
+    company: 'Job Title, Google',
+    gplus: 'http://plus.google.com/1234567890',
+    twitter: '@yourhandle',
+    www: 'http://www.you.com',
+    github: 'http://github.com/you'
+  }/*, {
+    name: 'Second Name',
+    company: 'Job Title, Google',
+    gplus: 'http://plus.google.com/1234567890',
+    twitter: '@yourhandle',
+    www: 'http://www.you.com',
+    github: 'http://github.com/you'
+  }*/]
+};
+
diff --git a/slide_config.json b/slide_config.json
deleted file mode 100644
index 0b37874..0000000
--- a/slide_config.json
+++ /dev/null
@@ -1,34 +0,0 @@
-var SLIDE_CONFIG = {
-  // Slide settings
-  settings: {
-    title: 'Title Goes Here<br>Up To Two Lines',
-    subtitle: 'Subtitle Goes Here',
-    useBuilds: true, // Default: true. False will turn off slide animation builds.
-    usePrettify: true, // Default: true
-    enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides.
-    enableTouch: true, // Default: true. If touch support should enabled. Note: the device must support touch.
-    //analytics: 'UA-XXXXXXXX-1',
-    favIcon: 'http://bleedinghtml5.appspot.com/images/chrome-logo-tiny2.png',
-    fonts: [
-      'Open Sans:regular,semibold,italic,italicsemibold',
-      'Inconsolata'
-    ],
-    //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension.
-  },
-
-  // Author information
-  presenters: [{
-    name: 'Firstname Lastname',
-    company: 'Job Title, Google',
-    gplus: 'http://plus.google.com/1234567890',
-    twitter: '@yourhandle',
-    www: 'http://www.you.com'
-  }/*, {
-    name: 'Eric Bidelman',
-    gplus: 'http://plus.ericbidelman.com',
-    company: 'Senior Developer Programs Engineer, Google Chrome',
-    twitter: '@ebidel',
-    www: 'http://www.ericbidelman.com'
-  }*/]
-};
-
diff --git a/template.html b/template.html
index 9d19d59..3560397 100644
--- a/template.html
+++ b/template.html
@@ -20,8 +20,9 @@ URL: https://code.google.com/p/io-2012-slides
   <link rel="stylesheet" media="all" href="theme/css/default.css">
   <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css">
   <base target="_blank"> <!-- This amazingness opens all links in a new tab. -->
+  <script data-main="js/slides" src="js/require-1.0.8.min.js"></script>
 </head>
-<body>
+<body style="opacity: 0">
 
 <slides class="layout-widescreen">
 
@@ -70,6 +71,8 @@ URL: https://code.google.com/p/io-2012-slides
         <li>Pressing 'h' highlights code snippets</li>
         <li>Pressing 'p' toggles speaker notes (if they're on the current slide)</li>
         <li>Pressing 'f' toggles fullscreen viewing</li>
+        <li>Pressing 'w' toggles widescreen</li>
+        <li>Pressing 'o' toggles overview mode</li>
         <li>Pressing 'ESC' toggles off these goodies</li>
       </ul>
       <p>Another list, but items fade as they build:</p>
@@ -393,8 +396,18 @@ function helloWorld(world) {
 
 </slides>
 
-<script src="slide_config.json" defer></script>
-<script src="js/slides.js" defer></script>
+<script>
+var _gaq = _gaq || [];
+_gaq.push(['_setAccount', 'UA-XXXXXXXX-1']);
+_gaq.push(['_trackPageview']);
+
+(function() {
+  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+})();
+</script>
+
 <!--[if IE]>
   <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
   <script>CFInstall.check({mode: 'overlay'});</script>
diff --git a/theme/.base.css.swp b/theme/.base.css.swp
deleted file mode 100644
index 563b356..0000000
Binary files a/theme/.base.css.swp and /dev/null differ
diff --git a/theme/.default.css.swp b/theme/.default.css.swp
deleted file mode 100644
index 1ae4a73..0000000
Binary files a/theme/.default.css.swp and /dev/null differ
diff --git a/theme/css/default.css b/theme/css/default.css
index 7cfbdb1..1d7ed72 100644
--- a/theme/css/default.css
+++ b/theme/css/default.css
@@ -94,7 +94,7 @@ body {
 }
 /* line 69, ../scss/_base.scss */
 body.loaded {
-  opacity: 1;
+  opacity: 1 !important;
 }
 
 /* line 74, ../scss/_base.scss */
@@ -123,9 +123,14 @@ slides {
   perspective: 1000;
   -webkit-transform-style: preserve-3d;
   transform-style: preserve-3d;
+  -webkit-transition: opacity 800ms ease-in 100ms;
+  -moz-transition: opacity 800ms ease-in 100ms;
+  -ms-transition: opacity 800ms ease-in 100ms;
+  -o-transition: opacity 800ms ease-in 100ms;
+  transition: opacity 800ms ease-in 100ms;
 }
 
-/* line 93, ../scss/_base.scss */
+/* line 94, ../scss/_base.scss */
 slides > slide {
   display: block;
   position: absolute;
@@ -171,21 +176,21 @@ slide.fill img {
 /**
  * Theme Styles
  */
-/* line 51, ../scss/default.scss */
+/* line 58, ../scss/default.scss */
 ::selection {
   color: white;
   background-color: #ffd14d;
   text-shadow: none;
 }
 
-/* line 57, ../scss/default.scss */
+/* line 64, ../scss/default.scss */
 ::-webkit-scrollbar {
   height: 16px;
   overflow: visible;
   width: 16px;
 }
 
-/* line 62, ../scss/default.scss */
+/* line 69, ../scss/default.scss */
 ::-webkit-scrollbar-thumb {
   background-color: rgba(0, 0, 0, 0.1);
   background-clip: padding-box;
@@ -198,35 +203,35 @@ slide.fill img {
   border-width: 1px 1px 1px 6px;
 }
 
-/* line 71, ../scss/default.scss */
+/* line 78, ../scss/default.scss */
 ::-webkit-scrollbar-thumb:hover {
   background-color: rgba(0, 0, 0, 0.5);
 }
 
-/* line 74, ../scss/default.scss */
+/* line 81, ../scss/default.scss */
 ::-webkit-scrollbar-button {
   height: 0;
   width: 0;
 }
 
-/* line 78, ../scss/default.scss */
+/* line 85, ../scss/default.scss */
 ::-webkit-scrollbar-track {
   background-clip: padding-box;
   border: solid transparent;
   border-width: 0 0 0 4px;
 }
 
-/* line 83, ../scss/default.scss */
+/* line 90, ../scss/default.scss */
 ::-webkit-scrollbar-corner {
   background: transparent;
 }
 
-/* line 87, ../scss/default.scss */
+/* line 94, ../scss/default.scss */
 body {
   background: black;
 }
 
-/* line 91, ../scss/default.scss */
+/* line 98, ../scss/default.scss */
 slides > slide {
   display: none;
   font-family: 'Open Sans', Arial, sans-serif;
@@ -248,49 +253,49 @@ slides > slide {
   -o-transition: all 0.6s ease-in-out;
   transition: all 0.6s ease-in-out;
 }
-/* line 112, ../scss/default.scss */
+/* line 119, ../scss/default.scss */
 slides > slide.far-past {
   display: none;
 }
-/* line 119, ../scss/default.scss */
+/* line 126, ../scss/default.scss */
 slides > slide.past {
   display: block;
   opacity: 0;
 }
-/* line 126, ../scss/default.scss */
+/* line 133, ../scss/default.scss */
 slides > slide.current {
   display: block;
   opacity: 1;
 }
-/* line 132, ../scss/default.scss */
+/* line 139, ../scss/default.scss */
 slides > slide.current .auto-fadein {
   opacity: 1;
 }
-/* line 136, ../scss/default.scss */
+/* line 143, ../scss/default.scss */
 slides > slide.current .gdbar {
   -webkit-background-size: 100% 100%;
   -moz-background-size: 100% 100%;
   -o-background-size: 100% 100%;
   background-size: 100% 100%;
 }
-/* line 141, ../scss/default.scss */
+/* line 148, ../scss/default.scss */
 slides > slide.next {
   display: block;
   opacity: 0;
   pointer-events: none;
 }
-/* line 149, ../scss/default.scss */
+/* line 156, ../scss/default.scss */
 slides > slide.far-next {
   display: none;
 }
-/* line 156, ../scss/default.scss */
+/* line 163, ../scss/default.scss */
 slides > slide.dark {
   background: #515151 !important;
 }
-/* line 164, ../scss/default.scss */
+/* line 171, ../scss/default.scss */
 slides > slide:not(.nobackground):before {
   font-size: 12pt;
-  content: "#io2012";
+  content: "#io12";
   position: absolute;
   bottom: 20px;
   left: 60px;
@@ -303,7 +308,7 @@ slides > slide:not(.nobackground):before {
   height: 30px;
   line-height: 1.9;
 }
-/* line 176, ../scss/default.scss */
+/* line 183, ../scss/default.scss */
 slides > slide:not(.nobackground):after {
   font-size: 12pt;
   content: attr(data-slide-num) "/" attr(data-total-slides);
@@ -312,7 +317,7 @@ slides > slide:not(.nobackground):after {
   right: 60px;
   line-height: 1.9;
 }
-/* line 187, ../scss/default.scss */
+/* line 194, ../scss/default.scss */
 slides > slide.title-slide:after {
   content: '';
   background: url(../../images/io2012_logo.png) no-repeat 100% 50%;
@@ -326,7 +331,7 @@ slides > slide.title-slide:after {
   width: 100%;
   height: 60px;
 }
-/* line 199, ../scss/default.scss */
+/* line 206, ../scss/default.scss */
 slides > slide.backdrop {
   z-index: -10;
   display: block !important;
@@ -338,43 +343,43 @@ slides > slide.backdrop {
   background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6);
   background-color: white;
 }
-/* line 205, ../scss/default.scss */
+/* line 211, ../scss/default.scss */
 slides > slide.backdrop:after, slides > slide.backdrop:before {
   display: none;
 }
-/* line 210, ../scss/default.scss */
+/* line 216, ../scss/default.scss */
 slides > slide > hgroup + article {
   margin-top: 45px;
 }
-/* line 214, ../scss/default.scss */
+/* line 220, ../scss/default.scss */
 slides > slide > hgroup + article.flexbox.vcenter, slides > slide > hgroup + article.flexbox.vleft, slides > slide > hgroup + article.flexbox.vright {
   height: 80%;
 }
-/* line 219, ../scss/default.scss */
+/* line 225, ../scss/default.scss */
 slides > slide > hgroup + article p {
   margin-bottom: 1em;
 }
-/* line 224, ../scss/default.scss */
+/* line 230, ../scss/default.scss */
 slides > slide > article:only-child {
   height: 100%;
 }
-/* line 227, ../scss/default.scss */
+/* line 233, ../scss/default.scss */
 slides > slide > article:only-child > iframe {
-  height: 100%;
+  height: 98%;
 }
 
-/* line 233, ../scss/default.scss */
+/* line 239, ../scss/default.scss */
 slides.layout-faux-widescreen > slide {
   padding: 40px 160px;
 }
 
-/* line 242, ../scss/default.scss */
+/* line 248, ../scss/default.scss */
 slides.layout-widescreen > slide,
 slides.layout-faux-widescreen > slide {
   margin-left: -550px;
   width: 1100px;
 }
-/* line 247, ../scss/default.scss */
+/* line 253, ../scss/default.scss */
 slides.layout-widescreen > slide.far-past,
 slides.layout-faux-widescreen > slide.far-past {
   display: block;
@@ -390,26 +395,26 @@ slides.layout-faux-widescreen > slide.far-past {
   -o-transform: translate3d(-2260px, 0, 0);
   transform: translate3d(-2260px, 0, 0);
 }
-/* line 254, ../scss/default.scss */
+/* line 260, ../scss/default.scss */
 slides.layout-widescreen > slide.past,
 slides.layout-faux-widescreen > slide.past {
   display: block;
   opacity: 0;
 }
-/* line 261, ../scss/default.scss */
+/* line 267, ../scss/default.scss */
 slides.layout-widescreen > slide.current,
 slides.layout-faux-widescreen > slide.current {
   display: block;
   opacity: 1;
 }
-/* line 268, ../scss/default.scss */
+/* line 274, ../scss/default.scss */
 slides.layout-widescreen > slide.next,
 slides.layout-faux-widescreen > slide.next {
   display: block;
   opacity: 0;
   pointer-events: none;
 }
-/* line 276, ../scss/default.scss */
+/* line 282, ../scss/default.scss */
 slides.layout-widescreen > slide.far-next,
 slides.layout-faux-widescreen > slide.far-next {
   display: block;
@@ -425,39 +430,39 @@ slides.layout-faux-widescreen > slide.far-next {
   -o-transform: translate3d(2260px, 0, 0);
   transform: translate3d(2260px, 0, 0);
 }
-/* line 283, ../scss/default.scss */
+/* line 289, ../scss/default.scss */
 slides.layout-widescreen #prev-slide-area,
 slides.layout-faux-widescreen #prev-slide-area {
   margin-left: -650px;
 }
-/* line 287, ../scss/default.scss */
+/* line 293, ../scss/default.scss */
 slides.layout-widescreen #next-slide-area,
 slides.layout-faux-widescreen #next-slide-area {
   margin-left: 550px;
 }
 
-/* line 292, ../scss/default.scss */
+/* line 298, ../scss/default.scss */
 b {
   font-weight: 600;
 }
 
-/* line 296, ../scss/default.scss */
+/* line 302, ../scss/default.scss */
 a {
   color: #2a7cdf;
   text-decoration: none;
   border-bottom: 1px solid rgba(42, 124, 223, 0.5);
 }
-/* line 301, ../scss/default.scss */
+/* line 307, ../scss/default.scss */
 a:hover {
   color: black !important;
 }
 
-/* line 306, ../scss/default.scss */
+/* line 312, ../scss/default.scss */
 h1, h2, h3 {
   font-weight: 600;
 }
 
-/* line 310, ../scss/default.scss */
+/* line 316, ../scss/default.scss */
 h2 {
   font-size: 45px;
   line-height: 45px;
@@ -465,7 +470,7 @@ h2 {
   color: #515151;
 }
 
-/* line 317, ../scss/default.scss */
+/* line 323, ../scss/default.scss */
 h3 {
   font-size: 30px;
   letter-spacing: -1px;
@@ -474,39 +479,39 @@ h3 {
   color: #797979;
 }
 
-/* line 325, ../scss/default.scss */
+/* line 331, ../scss/default.scss */
 ul {
   margin-left: 1.2em;
   margin-bottom: 1em;
   position: relative;
 }
-/* line 330, ../scss/default.scss */
+/* line 336, ../scss/default.scss */
 ul li {
   margin-bottom: 0.5em;
 }
-/* line 333, ../scss/default.scss */
+/* line 339, ../scss/default.scss */
 ul li ul {
   margin-left: 2em;
   margin-bottom: 0;
 }
-/* line 337, ../scss/default.scss */
+/* line 343, ../scss/default.scss */
 ul li ul li:before {
   content: '-';
   font-weight: 600;
 }
-/* line 344, ../scss/default.scss */
+/* line 350, ../scss/default.scss */
 ul > li:before {
   content: '·';
   margin-left: -1em;
   position: absolute;
   font-weight: 600;
 }
-/* line 351, ../scss/default.scss */
+/* line 357, ../scss/default.scss */
 ul ul {
   margin-top: .5em;
 }
 
-/* line 358, ../scss/default.scss */
+/* line 364, ../scss/default.scss */
 .highlight-code slide.current pre > * {
   opacity: 0.25;
   -webkit-transition: opacity 0.5s ease-in;
@@ -515,12 +520,12 @@ ul ul {
   -o-transition: opacity 0.5s ease-in;
   transition: opacity 0.5s ease-in;
 }
-/* line 362, ../scss/default.scss */
+/* line 368, ../scss/default.scss */
 .highlight-code slide.current b {
   opacity: 1;
 }
 
-/* line 367, ../scss/default.scss */
+/* line 373, ../scss/default.scss */
 pre {
   font-family: 'Inconsolata', 'Courier New', monospace;
   font-size: 20px;
@@ -537,8 +542,8 @@ pre {
   box-sizing: border-box;
   /*overflow: hidden;*/
 }
-/* line 381, ../scss/default.scss */
-pre:after {
+/* line 387, ../scss/default.scss */
+pre[data-lang]:after {
   content: attr(data-lang);
   background-color: #a9a9a9;
   right: 0;
@@ -550,14 +555,19 @@ pre:after {
   text-transform: uppercase;
 }
 
-/* line 394, ../scss/default.scss */
+/* line 400, ../scss/default.scss */
+pre[data-lang="go"] {
+  color: #333;
+}
+
+/* line 404, ../scss/default.scss */
 code {
   font-size: 95%;
   font-family: 'Inconsolata', 'Courier New', monospace;
   color: black;
 }
 
-/* line 400, ../scss/default.scss */
+/* line 410, ../scss/default.scss */
 iframe {
   width: 100%;
   height: 530px;
@@ -568,12 +578,12 @@ iframe {
   box-sizing: border-box;
 }
 
-/* line 408, ../scss/default.scss */
+/* line 418, ../scss/default.scss */
 dt {
   font-weight: bold;
 }
 
-/* line 412, ../scss/default.scss */
+/* line 422, ../scss/default.scss */
 button {
   display: inline-block;
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #f9f9f9), color-stop(70%, #e3e3e3));
@@ -599,12 +609,12 @@ button {
   font-size: 10pt;
 }
 
-/* line 426, ../scss/default.scss */
+/* line 436, ../scss/default.scss */
 button:not(:disabled):hover {
   border-color: #515151;
 }
 
-/* line 430, ../scss/default.scss */
+/* line 440, ../scss/default.scss */
 button:not(:disabled):active {
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #e3e3e3), color-stop(70%, #f9f9f9));
   background: -webkit-linear-gradient(#e3e3e3 40%, #f9f9f9 70%);
@@ -614,102 +624,102 @@ button:not(:disabled):active {
   background: linear-gradient(#e3e3e3 40%, #f9f9f9 70%);
 }
 
-/* line 434, ../scss/default.scss */
+/* line 444, ../scss/default.scss */
 :disabled {
   color: #a9a9a9;
 }
 
-/* line 438, ../scss/default.scss */
+/* line 448, ../scss/default.scss */
 .blue {
   color: #4387fd;
 }
 
-/* line 441, ../scss/default.scss */
+/* line 451, ../scss/default.scss */
 .blue2 {
   color: #3c8ef3;
 }
 
-/* line 444, ../scss/default.scss */
+/* line 454, ../scss/default.scss */
 .blue3 {
   color: #2a7cdf;
 }
 
-/* line 447, ../scss/default.scss */
+/* line 457, ../scss/default.scss */
 .yellow {
   color: #ffd14d;
 }
 
-/* line 450, ../scss/default.scss */
+/* line 460, ../scss/default.scss */
 .yellow2 {
   color: #f9cc46;
 }
 
-/* line 453, ../scss/default.scss */
+/* line 463, ../scss/default.scss */
 .yellow3 {
   color: #f6c000;
 }
 
-/* line 456, ../scss/default.scss */
+/* line 466, ../scss/default.scss */
 .green {
   color: #0da861;
 }
 
-/* line 459, ../scss/default.scss */
+/* line 469, ../scss/default.scss */
 .green2 {
   color: #00a86d;
 }
 
-/* line 462, ../scss/default.scss */
+/* line 472, ../scss/default.scss */
 .green3 {
   color: #009f5d;
 }
 
-/* line 465, ../scss/default.scss */
+/* line 475, ../scss/default.scss */
 .red {
   color: #f44a3f;
 }
 
-/* line 468, ../scss/default.scss */
+/* line 478, ../scss/default.scss */
 .red2 {
   color: #e0543e;
 }
 
-/* line 471, ../scss/default.scss */
+/* line 481, ../scss/default.scss */
 .red3 {
   color: #d94d3a;
 }
 
-/* line 474, ../scss/default.scss */
+/* line 484, ../scss/default.scss */
 .gray {
   color: #e6e6e6;
 }
 
-/* line 477, ../scss/default.scss */
+/* line 487, ../scss/default.scss */
 .gray2 {
   color: #a9a9a9;
 }
 
-/* line 480, ../scss/default.scss */
+/* line 490, ../scss/default.scss */
 .gray3 {
   color: #797979;
 }
 
-/* line 483, ../scss/default.scss */
+/* line 493, ../scss/default.scss */
 .gray4 {
   color: #515151;
 }
 
-/* line 487, ../scss/default.scss */
+/* line 497, ../scss/default.scss */
 .white {
   color: white !important;
 }
 
-/* line 490, ../scss/default.scss */
+/* line 500, ../scss/default.scss */
 .black {
   color: black !important;
 }
 
-/* line 494, ../scss/default.scss */
+/* line 504, ../scss/default.scss */
 .columns-2 {
   -webkit-column-count: 2;
   -moz-column-count: 2;
@@ -717,7 +727,7 @@ button:not(:disabled):active {
   column-count: 2;
 }
 
-/* line 498, ../scss/default.scss */
+/* line 508, ../scss/default.scss */
 table {
   width: 100%;
   border-collapse: -moz-initial;
@@ -725,16 +735,16 @@ table {
   border-spacing: 2px;
   border-bottom: 1px solid #797979;
 }
-/* line 505, ../scss/default.scss */
+/* line 515, ../scss/default.scss */
 table tr > td:first-child, table th {
   font-weight: 600;
   color: #515151;
 }
-/* line 510, ../scss/default.scss */
+/* line 520, ../scss/default.scss */
 table tr:nth-child(odd) {
   background-color: #e6e6e6;
 }
-/* line 514, ../scss/default.scss */
+/* line 524, ../scss/default.scss */
 table th {
   color: white;
   font-size: 18px;
@@ -745,12 +755,12 @@ table th {
   background: -ms-linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
   background: linear-gradient(top, #4387fd 40%, #2a7cdf 80%) no-repeat;
 }
-/* line 520, ../scss/default.scss */
+/* line 530, ../scss/default.scss */
 table td, table th {
   font-size: 18px;
   padding: 1em 0.5em;
 }
-/* line 525, ../scss/default.scss */
+/* line 535, ../scss/default.scss */
 table td.highlight {
   color: #515151;
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(40%, #ffd14d), color-stop(80%, #f6c000)) no-repeat;
@@ -760,31 +770,31 @@ table td.highlight {
   background: -ms-linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
   background: linear-gradient(top, #ffd14d 40%, #f6c000 80%) no-repeat;
 }
-/* line 530, ../scss/default.scss */
+/* line 540, ../scss/default.scss */
 table.rows {
   border-bottom: none;
   border-right: 1px solid #797979;
 }
 
-/* line 536, ../scss/default.scss */
+/* line 546, ../scss/default.scss */
 q {
   font-size: 45px;
   line-height: 72px;
 }
-/* line 540, ../scss/default.scss */
+/* line 550, ../scss/default.scss */
 q:before {
   content: '“';
   position: absolute;
   margin-left: -0.5em;
 }
-/* line 545, ../scss/default.scss */
+/* line 555, ../scss/default.scss */
 q:after {
   content: '”';
   position: absolute;
   margin-left: 0.1em;
 }
 
-/* line 552, ../scss/default.scss */
+/* line 562, ../scss/default.scss */
 slide.fill {
   background-repeat: no-repeat;
   -webkit-border-radius: 5px;
@@ -799,34 +809,34 @@ slide.fill {
 }
 
 /* Size variants */
-/* line 561, ../scss/default.scss */
+/* line 571, ../scss/default.scss */
 article.smaller p, article.smaller ul {
   font-size: 20px;
   line-height: 24px;
   letter-spacing: 0;
 }
-/* line 567, ../scss/default.scss */
+/* line 577, ../scss/default.scss */
 article.smaller table td, article.smaller table th {
   font-size: 14px;
 }
-/* line 571, ../scss/default.scss */
+/* line 581, ../scss/default.scss */
 article.smaller pre {
   font-size: 15px;
   line-height: 20px;
   letter-spacing: 0;
 }
-/* line 576, ../scss/default.scss */
+/* line 586, ../scss/default.scss */
 article.smaller q {
   font-size: 40px;
   line-height: 48px;
 }
-/* line 580, ../scss/default.scss */
+/* line 590, ../scss/default.scss */
 article.smaller q:before, article.smaller q:after {
   font-size: 60px;
 }
 
 /* Builds */
-/* line 589, ../scss/default.scss */
+/* line 599, ../scss/default.scss */
 .build > * {
   -webkit-transition: opacity 0.5s ease-in-out 0.2s;
   -moz-transition: opacity 0.5s ease-in-out 0.2s;
@@ -834,55 +844,64 @@ article.smaller q:before, article.smaller q:after {
   -o-transition: opacity 0.5s ease-in-out 0.2s;
   transition: opacity 0.5s ease-in-out 0.2s;
 }
-/* line 593, ../scss/default.scss */
+/* line 603, ../scss/default.scss */
 .build .to-build {
   opacity: 0;
 }
-/* line 597, ../scss/default.scss */
+/* line 607, ../scss/default.scss */
 .build .build-fade {
   opacity: 0.3;
 }
-/* line 600, ../scss/default.scss */
+/* line 610, ../scss/default.scss */
 .build .build-fade:hover {
   opacity: 1.0;
 }
 
+/* line 617, ../scss/default.scss */
+.popup .next .build .to-build {
+  opacity: 1;
+}
+/* line 621, ../scss/default.scss */
+.popup .next .build .build-fade {
+  opacity: 1;
+}
+
 /* Pretty print */
-/* line 609, ../scss/default.scss */
+/* line 629, ../scss/default.scss */
 .prettyprint .str,
 .prettyprint .atv {
   /* a markup attribute value */
   color: #009f5d;
 }
 
-/* line 613, ../scss/default.scss */
+/* line 633, ../scss/default.scss */
 .prettyprint .kwd,
 .prettyprint .tag {
   /* a markup tag name */
   color: #0066cc;
 }
 
-/* line 616, ../scss/default.scss */
+/* line 636, ../scss/default.scss */
 .prettyprint .com {
   /* a comment */
   color: #797979;
   font-style: italic;
 }
 
-/* line 620, ../scss/default.scss */
+/* line 640, ../scss/default.scss */
 .prettyprint .lit {
   /* a literal value */
   color: #7f0000;
 }
 
-/* line 625, ../scss/default.scss */
+/* line 645, ../scss/default.scss */
 .prettyprint .pun,
 .prettyprint .opn,
 .prettyprint .clo {
   color: #515151;
 }
 
-/* line 631, ../scss/default.scss */
+/* line 651, ../scss/default.scss */
 .prettyprint .typ,
 .prettyprint .atn,
 .prettyprint .dec,
@@ -891,12 +910,12 @@ article.smaller q:before, article.smaller q:after {
   color: #d94d3a;
 }
 
-/* line 634, ../scss/default.scss */
+/* line 654, ../scss/default.scss */
 .prettyprint .pln {
   color: #515151;
 }
 
-/* line 638, ../scss/default.scss */
+/* line 658, ../scss/default.scss */
 .note {
   position: absolute;
   z-index: 100;
@@ -944,7 +963,7 @@ article.smaller q:before, article.smaller q:after {
   -o-transition: all 0.4s ease-in-out;
   transition: all 0.4s ease-in-out;
 }
-/* line 656, ../scss/default.scss */
+/* line 676, ../scss/default.scss */
 .note > section {
   background: #fff;
   -webkit-border-radius: 5px;
@@ -959,7 +978,7 @@ article.smaller q:before, article.smaller q:after {
   padding: 2em;
 }
 
-/* line 673, ../scss/default.scss */
+/* line 693, ../scss/default.scss */
 .with-notes.popup slides.layout-widescreen slide.next,
 .with-notes.popup slides.layout-faux-widescreen slide.next {
   -webkit-transform: translate3d(690px, 80px, 0) scale(0.35);
@@ -968,7 +987,7 @@ article.smaller q:before, article.smaller q:after {
   -o-transform: translate3d(690px, 80px, 0) scale(0.35);
   transform: translate3d(690px, 80px, 0) scale(0.35);
 }
-/* line 676, ../scss/default.scss */
+/* line 696, ../scss/default.scss */
 .with-notes.popup slides.layout-widescreen slide .note,
 .with-notes.popup slides.layout-faux-widescreen slide .note {
   -webkit-transform: translate3d(300px, 800px, 0) scale(1.5);
@@ -977,7 +996,7 @@ article.smaller q:before, article.smaller q:after {
   -o-transform: translate3d(300px, 800px, 0) scale(1.5);
   transform: translate3d(300px, 800px, 0) scale(1.5);
 }
-/* line 682, ../scss/default.scss */
+/* line 702, ../scss/default.scss */
 .with-notes.popup slide {
   overflow: visible;
   background: white;
@@ -993,7 +1012,7 @@ article.smaller q:before, article.smaller q:after {
   -o-transform-origin: 0 0;
   transform-origin: 0 0;
 }
-/* line 689, ../scss/default.scss */
+/* line 709, ../scss/default.scss */
 .with-notes.popup slide:not(.backdrop) {
   -webkit-transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
   -moz-transform: scale(0.6) translate3d(0.5em, 0.5em, 0);
@@ -1004,7 +1023,7 @@ article.smaller q:before, article.smaller q:after {
   -moz-box-shadow: 0 0 10px #797979;
   box-shadow: 0 0 10px #797979;
 }
-/* line 694, ../scss/default.scss */
+/* line 714, ../scss/default.scss */
 .with-notes.popup slide.backdrop {
   background-image: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 600, color-stop(0%, #b1dfff), color-stop(100%, #4387fd));
   background-image: -webkit-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
@@ -1013,7 +1032,7 @@ article.smaller q:before, article.smaller q:after {
   background-image: -ms-radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
   background-image: radial-gradient(50% 50%, #b1dfff 0%, #4387fd 600px);
 }
-/* line 700, ../scss/default.scss */
+/* line 720, ../scss/default.scss */
 .with-notes.popup slide.next {
   -webkit-transform: translate3d(570px, 80px, 0) scale(0.35);
   -moz-transform: translate3d(570px, 80px, 0) scale(0.35);
@@ -1022,11 +1041,11 @@ article.smaller q:before, article.smaller q:after {
   transform: translate3d(570px, 80px, 0) scale(0.35);
   opacity: 1 !important;
 }
-/* line 704, ../scss/default.scss */
+/* line 724, ../scss/default.scss */
 .with-notes.popup slide.next .note {
   display: none !important;
 }
-/* line 710, ../scss/default.scss */
+/* line 730, ../scss/default.scss */
 .with-notes.popup .note {
   width: 109%;
   height: 260px;
@@ -1046,7 +1065,7 @@ article.smaller q:before, article