diff --git a/.gitignore b/.gitignore
index 4ad77ab..bd731ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+/_build
 /_layouts/private-*
 /_site
 /asset
diff --git a/CNAME b/CNAME
deleted file mode 100644
index 14a1bcc..0000000
--- a/CNAME
+++ /dev/null
@@ -1 +0,0 @@
-dpb587.me
diff --git a/_config.yml b/_config.yml
index caa29df..2952b32 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,3 +2,5 @@ markdown: redcarpet
 paginate: 7
 pygments: true
 safe: false
+environment: dev
+static_version: dev
diff --git a/_deploy/aws/deploy b/_deploy/aws/deploy
new file mode 100755
index 0000000..6aa465a
--- /dev/null
+++ b/_deploy/aws/deploy
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# args: s3cmd-config
+
+set -e
+
+[ -e _build ] && rm -fr _build
+
+mkdir _build
+
+STATIC_VERSION=`git rev-parse HEAD | cut -c -10`
+
+(
+  echo 'static_version:' "$STATIC_VERSION" ;
+  echo 'destination: _build/_site'
+  echo 'environment: prod'
+) > _build/_config.yml
+
+jekyll build --config _config.yml,_build/_config.yml 
+
+mv _build/_site/static/dev _build/_site/static/$STATIC_VERSION
+
+s3cmd sync \
+  --config "$1" \
+  --acl-public \
+  --no-delete-removed \
+  --no-preserve \
+  --exclude 'private/*' \
+  --verbose \
+  _build/_site/ \
+  s3://dpb587-us-west-2
diff --git a/_includes/header.html b/_includes/header.html
index 703e1e8..ee7f2f4 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -6,9 +6,9 @@
         <title>{% if page.title != "Home" %}{{ page.title }} &ndash; {% endif %}Danny Berger</title>
 
         <link href="http://fonts.googleapis.com/css?family=Lato:300,400,700,300italic,400italic,700italic" rel="stylesheet" type="text/css" />
-        <link href="/include/site/default.css" rel="stylesheet" type="text/css" />
-        <link href="/include/site/pygments.css" rel="stylesheet" type="text/css" />
-        <link href="/include/site/print.css" media="print" rel="stylesheet" type="text/css" />
+        <link href="/static/{{ site.static_version }}/style/default-common.css" rel="stylesheet" type="text/css" />
+        <link href="/static/{{ site.static_version }}/style/default-print.css" media="print" rel="stylesheet" type="text/css" />
+        <link href="/static/{{ site.static_version }}/style/pygments.css" rel="stylesheet" type="text/css" />
         <link href="/blog/atom.xml" type="application/atom+xml" rel="alternate" title="Danny Berger (blog)" />
 
         {% if page.path %}
@@ -51,6 +51,9 @@
                 <a href="/"><img alt="DPB" src="http://www.gravatar.com/avatar/5544fe6a05400da5a8957ff29dd6718c.png?s=128" /></a>
             </div>
             <ul class="screen-only">
+                {% if 'dev' == site.environment %}
+                    <li><a href="/private/">private</a></li>
+                {% endif %}
                 <li><a href="/blog/">blog</a></li>
                 <li><a href="/projects.html">projects</a></li>
                 <li><a href="/about.html">about</a></li>
diff --git a/_layouts/post.html b/_layouts/post.html
index 7601de1..c1b9857 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -6,10 +6,10 @@
                 <time datetime="{{ page.date|date_to_xmlschema }}" title="{{ page.date|date_to_xmlschema }}"><strong>{{ page.date|date:"%b %d"|upcase }}</strong><br />{{ page.date|date:"%Y" }}</time>
             {% endif %}
             {% if page.location %}
-                <a href="https://maps.google.com/maps?hl=en&ll={{ page.location.latitude }},{{ page.location.longitude }}&t=w&z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ page.location.latitude }},{{ page.location.longitude }}&zoom=9&size=98x98&sensor=false" title="{{ page.location.title }}" width="49" /></a>
+                <a href="https://maps.google.com/maps?hl=en&amp;ll={{ page.location.latitude }},{{ page.location.longitude }}&amp;t=w&amp;z=12"><img alt="map" height="49" src="https://maps.googleapis.com/maps/api/staticmap?center={{ page.location.latitude }},{{ page.location.longitude }}&amp;zoom=9&amp;size=98x98&amp;sensor=false" title="{{ page.location.title }}" width="49" /></a>
             {% endif %}
             {% if page.code %}
-                <a href="{{ page.code }}"><img alt="code" height="49" src="/include/icons/code.png" width="49" /></a>
+                <a href="{{ page.code }}"><img alt="code" height="49" src="/static/{{ site.static_version }}/icon/code.png" width="49" /></a>
             {% endif %}
         </div>
         <div class="social screen-only">
@@ -29,6 +29,8 @@
             <div class="g-plusone" data-size="medium" data-width="300"></div>
         </div>
     </div>
-    {% include disqus.html %}
+    {% if false != page.comments %}
+        {% include disqus.html %}
+    {% endif %}
 </section>
 {% include footer.html %}
diff --git a/error/http-400.html b/error/http-400.html
new file mode 100644
index 0000000..260af8b
--- /dev/null
+++ b/error/http-400.html
@@ -0,0 +1,17 @@
+---
+title: "Error: Bad Request"
+layout: default
+---
+
+<section>
+    <header>
+        <h1>
+            Error: Bad Request
+            <small>HTTP 400</small>
+        </h1>
+    </header>
+    <section class="post-content">
+        <p>Sorry, your client sent a bad request.</p>
+        <p>You might try going back to the <a href="/">home page</a>.</p>
+    </section>
+</section>
diff --git a/error/http-403.html b/error/http-403.html
new file mode 100644
index 0000000..e88ef7f
--- /dev/null
+++ b/error/http-403.html
@@ -0,0 +1,17 @@
+---
+title: "Error: Forbidden"
+layout: default
+---
+
+<section>
+    <header>
+        <h1>
+            Error: Forbidden
+            <small>HTTP 403</small>
+        </h1>
+    </header>
+    <section class="post-content">
+        <p>Sorry, you do not have permission to access this resource.</p>
+        <p>You might try going back to the <a href="/">home page</a>.</p>
+    </section>
+</section>
diff --git a/error/http-404.html b/error/http-404.html
new file mode 100644
index 0000000..74e5303
--- /dev/null
+++ b/error/http-404.html
@@ -0,0 +1,17 @@
+---
+title: "Error: Not Found"
+layout: default
+---
+
+<section>
+    <header>
+        <h1>
+            Error: Not Found
+            <small>HTTP 404</small>
+        </h1>
+    </header>
+    <section class="post-content">
+        <p>Sorry, the resource you are looking for cannot be found.</p>
+        <p>You might try going back to the <a href="/">home page</a>.</p>
+    </section>
+</section>
diff --git a/error/http-405.html b/error/http-405.html
new file mode 100644
index 0000000..4ac8803
--- /dev/null
+++ b/error/http-405.html
@@ -0,0 +1,17 @@
+---
+title: "Error: Method Not Allowed"
+layout: default
+---
+
+<section>
+    <header>
+        <h1>
+            Error: Method Not Allowed
+            <small>HTTP 405</small>
+        </h1>
+    </header>
+    <section class="post-content">
+        <p>Sorry, your client is using a request method which is not allowed.</p>
+        <p>You might try going back to the <a href="/">home page</a>.</p>
+    </section>
+</section>
diff --git a/include/content/header-simple.html b/static/dev/content/header-simple.html
similarity index 100%
rename from include/content/header-simple.html
rename to static/dev/content/header-simple.html
diff --git a/include/icons/code.png b/static/dev/icon/code.png
similarity index 100%
rename from include/icons/code.png
rename to static/dev/icon/code.png
diff --git a/include/site/default.css b/static/dev/style/default-common.css
similarity index 100%
rename from include/site/default.css
rename to static/dev/style/default-common.css
diff --git a/include/site/print.css b/static/dev/style/default-print.css
similarity index 100%
rename from include/site/print.css
rename to static/dev/style/default-print.css
diff --git a/include/site/pygments.css b/static/dev/style/pygments.css
similarity index 100%
rename from include/site/pygments.css
rename to static/dev/style/pygments.css