diff --git a/_includes/head.html b/_includes/head.html
index c6503f6..3e65c92 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -15,16 +15,16 @@
   </title>
 
   <!-- CSS -->
-  <link rel="stylesheet" href="{{ site.baseurl }}public/css/poole.css">
-  <link rel="stylesheet" href="{{ site.baseurl }}public/css/syntax.css">
-  <link rel="stylesheet" href="{{ site.baseurl }}public/css/hyde.css">
+  <link rel="stylesheet" href="{{ "public/css/poole.css" | prepend: site.baseurl }}">
+  <link rel="stylesheet" href="{{ "public/css/syntax.css" | prepend: site.baseurl }}">
+  <link rel="stylesheet" href="{{ "public/css/hyde.css" | prepend: site.baseurl }}">
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=PT+Sans:400,400italic,700|Abril+Fatface">
 
   <!-- Icons -->
-  <link rel="shortcut icon" href="{{ site.baseurl }}public/favicon.ico">
+  <link rel="shortcut icon" href="{{ "public/favicon.ico" | prepend: site.baseurl }}">
 
   <!-- RSS -->
-  <link rel="alternate" type="application/atom+xml" title="{{ site.title }} Feed" href="{{ site.baseurl }}feed.xml">
+  <link rel="alternate" type="application/atom+xml" title="{{ site.title }} Feed" href="{{ "/feed.xml" | prepend: site.url }}">
 
   <!-- humans.txt -->
   <link rel="author" href="humans.txt">
diff --git a/_layouts/post.html b/_layouts/post.html
index 7b582cb..61058ff 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -25,20 +25,20 @@ layout: default
 </div>
 
 {% if page.comments %}
-<div class="comments">
-  <h2>Comments</h2>
-  <div id="disqus_thread"></div>
-</div>
+  <div class="comments">
+    <h2>Comments</h2>
+    <div id="disqus_thread"></div>
+  </div>
 
-<script type="text/javascript">
-  /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-  var disqus_shortname = '{{ site.disqus_shortname }}';
+  <script type="text/javascript">
+    /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+    var disqus_shortname = '{{ site.disqus_shortname }}';
 
-  /* * * DON'T EDIT BELOW THIS LINE * * */
-  (function() {
-    var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-    dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-  })();
-</script>
+    /* * * DON'T EDIT BELOW THIS LINE * * */
+    (function() {
+      var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+      dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+      (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+    })();
+  </script>
 {% endif %}
diff --git a/_posts/2014-03-23-buffered-polyline.md b/_posts/2014-03-23-buffered-polyline.md
index bdf0142..0838e43 100644
--- a/_posts/2014-03-23-buffered-polyline.md
+++ b/_posts/2014-03-23-buffered-polyline.md
@@ -42,4 +42,4 @@ Since it is nested, you need to call `polygon.coordinates[0]` in order to get ba
 
 You could then use the the coordinates to draw the generated polygon on the map (along with the route), in order to produce something like this:
 
-![Buffered Polyline]({{ site.baseurl }}public/images/buffered-polyline-1.png)
+![Buffered Polyline]({{ "public/images/buffered-polyline-1.png" | prepend: site.baseurl }})
diff --git a/_posts/2014-04-12-installing-erlang-17-0-using-kerl.md b/_posts/2014-04-12-installing-erlang-17-0-using-kerl.md
index a947978..61698cd 100644
--- a/_posts/2014-04-12-installing-erlang-17-0-using-kerl.md
+++ b/_posts/2014-04-12-installing-erlang-17-0-using-kerl.md
@@ -50,4 +50,4 @@ The following `alias` makes it easier to start the Observer from a terminal. The
 alias erlobserver='erl -sname observer -run observer -detached'
 {% endhighlight %}
 
-![Erlang Observer]({{ site.baseurl }}public/images/installing-erlang-17-0-using-kerl-1.png)
+![Erlang Observer]({{ "public/images/installing-erlang-17-0-using-kerl-1.png" || prepend: site.baseurl }})
diff --git a/feed.xml b/feed.xml
index 8bbafa6..eb486d9 100644
--- a/feed.xml
+++ b/feed.xml
@@ -4,7 +4,7 @@ layout: null
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title>{{ site.title }}</title>
-  <link rel="self" href="{{ site.url }}/feed.xml" />
+  <link rel="self" href="{{ "/feed.xml" | prepend: site.url }}" />
   <link href="{{ site.url }}/"/>
   <link rel="hub" href="{{ site.hub_url }}/" />
   <updated>{{ site.time | date_to_xmlschema }}</updated>
@@ -18,7 +18,7 @@ layout: null
     <entry>
       <id>{{ site.url }}{{ post.id }}</id>
       <title>{{ post.title }}</title>
-      <link href="{{ site.url }}{{ post.url }}" />
+      <link href="{{ post.url | prepend: site.url }}" />
       <published>{{ post.date | date_to_xmlschema }}</published>
       {% if post.modified != nil %}
         <updated>{{ post.modified | date_to_xmlschema }}</updated>