diff --git a/pelican/generators.py b/pelican/generators.py
index 0dc3667f..b6806cc7 100644
--- a/pelican/generators.py
+++ b/pelican/generators.py
@@ -56,6 +56,7 @@ class Generator(object):
                                          "themes", "simple", "templates"))
         self.env = Environment(
             trim_blocks=True,
+            lstrip_blocks=True,
             loader=ChoiceLoader([
                 FileSystemLoader(self._templates_path),
                 simple_loader,  # implicit inheritance
diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 94b6e4ca..57eb6bed 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,46 +15,46 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index 57f4a57a..a4f51b2f 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,15 +15,15 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
 <h1>Archives for A Pelican Blog</h1>
 
 <dl>
@@ -48,14 +48,14 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index cfe91009..2cf5c308 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 1</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index 70f38852..42cadc58 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 2</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index 20e58fcc..e63dcb49 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Article 3</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 7f7a8c6b..88d02220 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - Alexis Métaireau</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,48 +46,48 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index a5eb2621..5bacf1fe 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <ul>
+<ul>
     <li><a href="/category/bar.html">bar</a></li>
     <li><a href="/category/cat1.html">cat1</a></li>
     <li><a href="/category/misc.html">misc</a></li>
     <li><a href="/category/yeah.html">yeah</a></li>
 </ul>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 9e3b52f1..8e054005 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +46,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index c8912fc2..26a65d49 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - cat1</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,112 +15,112 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li class="active"><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="/article-1.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="/article-2.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="/article-3.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index af223812..cc3366d8 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - misc</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,93 +15,93 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="/second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index f401e3d2..c0069d67 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -52,18 +52,18 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index 3092742b..7caf8d90 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,45 +15,45 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/filename_metadata-example.html" rel="bookmark"
            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index c5b9fec3..7b700c34 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,192 +15,192 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="/second-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="/unbelievable.html">a root-relative link to unbelievable</a>
 <a href="/unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="/a-markdown-powered-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="/article-1.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="/article-2.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-        <p>In <a href="/category/cat1.html">cat1</a>. </p>
+<p>In <a href="/category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="/article-3.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -210,43 +210,43 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="/unbelievable.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index 62834917..b018b531 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,32 +15,32 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -50,18 +50,18 @@ YEAH !</p>
 </div>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index e75c75f7..50ba6aae 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,31 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">Override url/save_as</h1>
-        
-        <p>Test page which overrides save_as and url so that this page will be generated
+    
+    <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
index 6b5ae4c8..eee741d5 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-hidden-page.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,31 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
-        
-        <p>This is great for things like error(404) pages
+    
+    <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/pages/this-is-a-test-page.html b/pelican/tests/output/basic/pages/this-is-a-test-page.html
index 9f1572af..98e12205 100644
--- a/pelican/tests/output/basic/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/basic/pages/this-is-a-test-page.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a test page</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,31 +15,31 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
-        
-        <p>Just an image.</p>
+    
+    <p>Just an image.</p>
 <img alt="alternate text" src="|filename|/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index f0c166de..b52619bd 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Deuxième article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article.html">en</a>
-    
+        <a href="/second-article.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 6cc42c66..8be34630 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Second article</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 20824993..035de8ae 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - bar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,81 +15,81 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -99,19 +99,19 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="/oh-yeah.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 65632313..34d3f9cf 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - baz</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,43 +15,43 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 05a02a5f..33368833 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - foo</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,73 +15,73 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/baz.html">baz</a></p>Translations: 
-            <a href="/second-article-fr.html">fr</a>
-    
+        <a href="/second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
                 </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="/this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="/this-is-a-super-article.html">read more</a>
-                                </div><!-- /.entry-content -->
+                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                                                    </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index c683f1a1..c963a160 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - foobar</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -52,18 +52,18 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index 610a7aa3..eac2e8f9 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - oh</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +46,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index 2afb8bd3..ea455f32 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>A Pelican Blog - yeah</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,29 +15,29 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/bar.html">bar</a>. </p>
+<p>In <a href="/category/bar.html">bar</a>. </p>
 <p>tags: <a href="/tag/oh.html">oh</a><a href="/tag/bar.html">bar</a><a href="/tag/yeah.html">yeah</a></p>
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
@@ -46,18 +46,18 @@ YEAH !</p>
 <img alt="alternate text" src="|filename|/pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
                 </article>
-                                                                </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                                <div class="social">
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/this-is-a-super-article.html b/pelican/tests/output/basic/this-is-a-super-article.html
index 617b8c6d..f5fb3385 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>This is a super article !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,32 +15,32 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li ><a href="/category/misc.html">misc</a></li>
-                                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li ><a href="/category/misc.html">misc</a></li>
+                    <li class="active"><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="/author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="/category/yeah.html">yeah</a>. </p>
+<p>In <a href="/category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="/tag/foo.html">foo</a><a href="/tag/bar.html">bar</a><a href="/tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,18 +56,18 @@
 </div>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index 73c95423..0f76aa87 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -4,8 +4,8 @@
         <meta charset="utf-8">
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="/theme/css/main.css">
-                <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
-                
+        <link href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="A Pelican Blog Atom Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -15,47 +15,47 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li><a href="/override/">Override url/save_as</a></li>
-                                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="/category/bar.html">bar</a></li>
-                                    <li ><a href="/category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="/category/misc.html">misc</a></li>
-                                    <li ><a href="/category/yeah.html">yeah</a></li>
-                                                </ul></nav>
+                    <li><a href="/override/">Override url/save_as</a></li>
+                    <li><a href="/pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="/category/bar.html">bar</a></li>
+                    <li ><a href="/category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="/category/misc.html">misc</a></li>
+                    <li ><a href="/category/yeah.html">yeah</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="/unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-        <p>In <a href="/category/misc.html">misc</a>. </p>
+<p>In <a href="/category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="/a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                            
-                                                </ul>
+
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 7b953a61..e4613d20 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>A markdown powered article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,38 +19,38 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./a-markdown-powered-article.html" rel="bookmark"
            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
 <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -63,33 +63,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 8437e350..8bf5261f 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,15 +19,15 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
 <h1>Archives for Alexis' log</h1>
 
 <dl>
@@ -52,29 +52,29 @@
 </dl>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index c52fdd9a..482c3635 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 1</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-1.html" rel="bookmark"
            title="Permalink to Article 1">Article 1</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 1</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 7a045bdc..4849d037 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 2</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-2.html" rel="bookmark"
            title="Permalink to Article 2">Article 2</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 2</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index f887218c..fb1fb96a 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Article 3</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li class="active"><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./article-3.html" rel="bookmark"
            title="Permalink to Article 3">Article 3</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Article 3</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index f18b8ce8..421e4fd6 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,143 +19,143 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
 <a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="../article-1.html">read more</a>
-                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="../article-2.html">read more</a>
-                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="../article-3.html">read more</a>
-                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 3
-            <a href="../author/alexis-metaireau2.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="../author/alexis-metaireau2.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 9f4a31e8..4a92f5a9 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,64 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                 
-                            <section id="content" class="body">
+ 
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../filename_metadata-example.html" rel="bookmark"
                            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Some cool stuff!</p>
 
                 <a class="readmore" href="../filename_metadata-example.html">read more</a>
-                <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>. </p>
 <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -85,92 +85,92 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
-                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-                        <a href="../author/alexis-metaireau.html">&laquo;</a>
-                Page 2 / 3
-            <a href="../author/alexis-metaireau3.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+            <a href="../author/alexis-metaireau.html">&laquo;</a>
+    Page 2 / 3
+        <a href="../author/alexis-metaireau3.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 4eda0b62..c12cb21f 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - Alexis Métaireau</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,74 +19,74 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                 
-                            <section id="content" class="body">
+ 
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-                        <a href="../author/alexis-metaireau2.html">&laquo;</a>
-                Page 3 / 3
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+            <a href="../author/alexis-metaireau2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index 146d7f3a..8755c83a 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,44 +19,44 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <ul>
+<ul>
     <li><a href="./category/yeah.html">yeah</a></li>
     <li><a href="./category/misc.html">misc</a></li>
     <li><a href="./category/cat1.html">cat1</a></li>
     <li><a href="./category/bar.html">bar</a></li>
 </ul>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index f7f1bbf3..4b46920e 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,32 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>. </p>
 <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +52,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index 10c4ce76..6309930a 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - cat1</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,142 +19,142 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li class="active"><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info --><p>You're mutually oblivious.</p>
 <p><a href="../unbelievable.html">a root-relative link to unbelievable</a>
 <a href="../unbelievable.html">a file-relative link to unbelievable</a></p><p>There are <a href="../a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="../article-1.html">read more</a>
-                <p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="../article-2.html">read more</a>
-                <p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/cat1.html">cat1</a>. </p>
+<p>In <a href="../category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="../article-3.html">read more</a>
-                <p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 121c9451..6ab335f0 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - misc</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,120 +19,120 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="../filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="../second-article.html">read more</a>
-                <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="../a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="../a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="../unbelievable.html">read more</a>
-                <p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index f7cc8d12..2ea9850a 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,29 +19,29 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,36 +56,36 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index 493eb611..d52f797a 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>A draft article</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,64 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="../a-draft-article.html" rel="bookmark"
            title="Permalink to A draft article">A draft article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>This is a draft article, it should live under the /drafts/ folder and not be
 listed anywhere else.</p>
 
     </div><!-- /.entry-content -->
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 626e8c64..d7b6f4ec 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>FILENAME_METADATA example</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,37 +19,37 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./filename_metadata-example.html" rel="bookmark"
            title="Permalink to FILENAME_METADATA example">FILENAME_METADATA example</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Some cool stuff!</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -62,33 +62,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 1a1d89e9..cf974266 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,145 +19,145 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-11-30T00:00:00">
                 Fri 30 November 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info --><p>Some cool stuff!</p>
 <p>There are <a href="./filename_metadata-example.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./second-article.html" rel="bookmark"
                            title="Permalink to Second article">Second article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
-    
+        <a href="./second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <p>This is some article, in english</p>
 
                 <a class="readmore" href="./second-article.html">read more</a>
-                <p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./second-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./a-markdown-powered-article.html" rel="bookmark"
                            title="Permalink to A markdown powered article">A markdown powered article</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-04-20T00:00:00">
                 Wed 20 April 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>You're mutually oblivious.</p>
 <p><a href="./unbelievable.html">a root-relative link to unbelievable</a>
 <a href="./unbelievable.html">a file-relative link to unbelievable</a></p>
                 <a class="readmore" href="./a-markdown-powered-article.html">read more</a>
-                <p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./a-markdown-powered-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-1.html" rel="bookmark"
                            title="Permalink to Article 1">Article 1</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 1</p>
 
                 <a class="readmore" href="./article-1.html">read more</a>
-                <p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-1.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 3
-            <a href="./index2.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 3
+        <a href="./index2.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index b8e2ac1a..73283a74 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,115 +19,115 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                 
-                            <section id="content" class="body">
+ 
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-2.html" rel="bookmark"
                            title="Permalink to Article 2">Article 2</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 2</p>
 
                 <a class="readmore" href="./article-2.html">read more</a>
-                <p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-2.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./article-3.html" rel="bookmark"
                            title="Permalink to Article 3">Article 3</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2011-02-17T00:00:00">
                 Thu 17 February 2011
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/cat1.html">cat1</a>. </p>
+<p>In <a href="./category/cat1.html">cat1</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Article 3</p>
 
                 <a class="readmore" href="./article-3.html">read more</a>
-                <p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./article-3.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="./this-is-a-super-article.html">read more</a>
-                <p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>In <a href="./category/bar.html">bar</a>. </p>
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+        <a href="./oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -136,39 +136,39 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="./oh-yeah.html">read more</a>
-                <p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-                        <a href="./index.html">&laquo;</a>
-                Page 2 / 3
-            <a href="./index3.html">&raquo;</a>
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+            <a href="./index.html">&laquo;</a>
+    Page 2 / 3
+        <a href="./index3.html">&raquo;</a>
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index cf285ea2..897e104b 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,74 +19,74 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                 
-                            <section id="content" class="body">
+ 
+                <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="3">
-                        <li><article class="hentry">    
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="./unbelievable.html" rel="bookmark"
                            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->                <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
                 <a class="readmore" href="./unbelievable.html">read more</a>
-                <p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="./unbelievable.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-                        <a href="./index2.html">&laquo;</a>
-                Page 3 / 3
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+            <a href="./index2.html">&laquo;</a>
+    Page 3 / 3
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 95077c2f..384660f3 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,41 +19,41 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        
+
 Some text
 
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index e34e6078..90ab383c 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Trop bien !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./oh-yeah-fr.html" rel="bookmark"
            title="Permalink to Trop bien !">Trop bien !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-03-02T14:01:01">
                 Fri 02 March 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 Translations: 
-            <a href="./oh-yeah.html">en</a>
-    
+        <a href="./oh-yeah.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Et voila du contenu en français</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@ Translations:
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 2f6ca309..648aedd7 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Oh yeah !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,35 +19,35 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li class="active"><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li class="active"><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./oh-yeah.html" rel="bookmark"
            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/bar.html">bar</a>. </p>
+<p>In <a href="./category/bar.html">bar</a>. </p>
 <p>tags: <a href="./tag/oh.html">oh</a><a href="./tag/bar.html">bar</a><a href="./tag/yeah.html">yeah</a></p>Translations: 
-            <a href="./oh-yeah-fr.html">fr</a>
-    
+        <a href="./oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -56,7 +56,7 @@ YEAH !</p>
 </div>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -69,33 +69,33 @@ YEAH !</p>
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index ad9fb8b1..409c26ad 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Override url/save_as</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,46 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">Override url/save_as</h1>
-        
-        <p>Test page which overrides save_as and url so that this page will be generated
+    
+    <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
index b4ac59b0..2420c357 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-hidden-page.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a test hidden page</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,46 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test hidden page</h1>
-        
-        <p>This is great for things like error(404) pages
+    
+    <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/pages/this-is-a-test-page.html b/pelican/tests/output/custom/pages/this-is-a-test-page.html
index b4cb678c..10a4543b 100644
--- a/pelican/tests/output/custom/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom/pages/this-is-a-test-page.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a test page</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,46 +19,46 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
+        
 <section id="content" class="body">    
     <h1 class="entry-title">This is a test page</h1>
-        
-        <p>Just an image.</p>
+    
+    <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index 3d5fbd29..f81c6cce 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Deuxième article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./second-article-fr.html" rel="bookmark"
            title="Permalink to Deuxième article">Deuxième article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article.html">en</a>
-    
+        <a href="./second-article.html">en</a>
+
 </footer><!-- /.post-info -->      <p>Ceci est un article, en français.</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index be83983e..c9bbb8d5 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Second article</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./second-article.html" rel="bookmark"
            title="Permalink to Second article">Second article</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/baz.html">baz</a></p>Translations: 
-            <a href="./second-article-fr.html">fr</a>
-    
+        <a href="./second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info -->      <p>This is some article, in english</p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index d1805e50..67f268a0 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - bar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,87 +19,87 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../oh-yeah.html" rel="bookmark"
                            title="Permalink to Oh yeah !">Oh yeah !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>. </p>
 <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info -->                <div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -108,37 +108,37 @@ YEAH !</p>
 </div>
 
                 <a class="readmore" href="../oh-yeah.html">read more</a>
-                <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index a6d23907..5ddbee3d 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - baz</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,64 +19,64 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 04cb7529..5a1c7cae 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - foo</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,94 +19,94 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2012-02-29T00:00:00">
                 Wed 29 February 2012
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/misc.html">misc</a>. </p>
+<p>In <a href="../category/misc.html">misc</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/baz.html">baz</a></p>Translations: 
-            <a href="../second-article-fr.html">fr</a>
-    
+        <a href="../second-article-fr.html">fr</a>
+
 </footer><!-- /.post-info --><p>This is some article, in english</p>
 <p>There are <a href="../second-article.html#disqus_thread">comments</a>.</p>                </article>
-                            </aside><!-- /#featured -->
-                            <section id="content" class="body">
+            </aside><!-- /#featured -->
+                <section id="content" class="body">
                     <h1>Other articles</h1>
                     <hr />
                     <ol id="posts-list" class="hfeed">
-                                                
+        
 
-                 
-                        <li><article class="hentry">    
+ 
+            <li><article class="hentry">    
                 <header>
                     <h1><a href="../this-is-a-super-article.html" rel="bookmark"
                            title="Permalink to This is a super article !">This is a super article !</a></h1>
                 </header>
                 
                 <div class="entry-content">
-                <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->                <p class="first last">Multi-line metadata should be supported
 as well as <strong>inline markup</strong>.</p>
 
                 <a class="readmore" href="../this-is-a-super-article.html">read more</a>
-                <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
+<p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </div><!-- /.entry-content -->
             </article></li>
-                            </ol><!-- /#posts-list -->
-                            <p class="paginator">
-        Page 1 / 1
-    </p>
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+            </ol><!-- /#posts-list -->
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 2c50c8ae..c956795c 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - foobar</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,29 +19,29 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/yeah.html">yeah</a>. </p>
+<p>In <a href="../category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="../tag/foo.html">foo</a><a href="../tag/bar.html">bar</a><a href="../tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info --><p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -56,36 +56,36 @@
 <p>→ And now try with some utf8 hell: ééé</p>
 </div>
 <p>There are <a href="../this-is-a-super-article.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index b798964e..a8602634 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - oh</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,32 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>. </p>
 <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +52,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 54ad93c6..4b7f9692 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Alexis' log - yeah</title>
         <link rel="stylesheet" href="../theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,32 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="../override/">Override url/save_as</a></li>
-                                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="../category/yeah.html">yeah</a></li>
-                                    <li ><a href="../category/misc.html">misc</a></li>
-                                    <li ><a href="../category/cat1.html">cat1</a></li>
-                                    <li ><a href="../category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="../override/">Override url/save_as</a></li>
+                    <li><a href="../pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="../category/yeah.html">yeah</a></li>
+                    <li ><a href="../category/misc.html">misc</a></li>
+                    <li ><a href="../category/cat1.html">cat1</a></li>
+                    <li ><a href="../category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-                
-            
+        
+        
 
-                            <aside id="featured" class="body">
+            <aside id="featured" class="body">
                 <article>
                     <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1> 
-                    <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-20T10:14:00">
                 Wed 20 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="../author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="../category/bar.html">bar</a>. </p>
+<p>In <a href="../category/bar.html">bar</a>. </p>
 <p>tags: <a href="../tag/oh.html">oh</a><a href="../tag/bar.html">bar</a><a href="../tag/yeah.html">yeah</a></p>Translations: 
-            <a href="../oh-yeah-fr.html">fr</a>
-    
+        <a href="../oh-yeah-fr.html">fr</a>
+
 </footer><!-- /.post-info --><div class="section" id="why-not">
 <h2>Why not ?</h2>
 <p>After all, why not ? It's pretty simple to do it, and it will allow me to write my blogposts in rst !
@@ -52,36 +52,36 @@ YEAH !</p>
 <img alt="alternate text" src="../pictures/Sushi.jpg" style="width: 600px; height: 450px;" />
 </div>
 <p>There are <a href="../oh-yeah.html#disqus_thread">comments</a>.</p>                </article>
-                                    <p class="paginator">
-        Page 1 / 1
-    </p>
-                            </aside><!-- /#featured -->
-                                                </ol><!-- /#posts-list -->
-                        </section><!-- /#content -->
-                    <section id="extras" class="body">
-                        <div class="blogroll">
+<p class="paginator">
+    Page 1 / 1
+</p>
+            </aside><!-- /#featured -->
+            </ol><!-- /#posts-list -->
+            </section><!-- /#content -->
+        <section id="extras" class="body">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/this-is-a-super-article.html b/pelican/tests/output/custom/this-is-a-super-article.html
index 1fdd8897..1ddfc61b 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>This is a super article !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,32 +19,32 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
-                                    <li ><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li class="active"><a href="./category/yeah.html">yeah</a></li>
+                    <li ><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./this-is-a-super-article.html" rel="bookmark"
            title="Permalink to This is a super article !">This is a super article !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-12-02T10:14:00">
                 Thu 02 December 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/yeah.html">yeah</a>. </p>
+<p>In <a href="./category/yeah.html">yeah</a>. </p>
 <p>tags: <a href="./tag/foo.html">foo</a><a href="./tag/bar.html">bar</a><a href="./tag/foobar.html">foobar</a></p>
 </footer><!-- /.post-info -->      <p>Some content here !</p>
 <div class="section" id="this-is-a-simple-title">
@@ -60,7 +60,7 @@
 </div>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -73,33 +73,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index e7253497..026f2765 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -4,9 +4,9 @@
         <meta charset="utf-8">
         <title>Unbelievable !</title>
         <link rel="stylesheet" href="./theme/css/main.css">
-                <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
-                        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
-        
+        <link href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate" title="Alexis' log Atom Feed" />
+        <link href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate" title="Alexis' log RSS Feed" />
+
         <!--[if IE]>
             <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
         <![endif]-->
@@ -19,39 +19,39 @@
         <header id="banner" class="body">
                 <h1><a href="./">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li><a href="./override/">Override url/save_as</a></li>
-                                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
-                                                                    <li ><a href="./category/yeah.html">yeah</a></li>
-                                    <li class="active"><a href="./category/misc.html">misc</a></li>
-                                    <li ><a href="./category/cat1.html">cat1</a></li>
-                                    <li ><a href="./category/bar.html">bar</a></li>
-                                                </ul></nav>
+                    <li><a href="./override/">Override url/save_as</a></li>
+                    <li><a href="./pages/this-is-a-test-page.html">This is a test page</a></li>
+                    <li ><a href="./category/yeah.html">yeah</a></li>
+                    <li class="active"><a href="./category/misc.html">misc</a></li>
+                    <li ><a href="./category/cat1.html">cat1</a></li>
+                    <li ><a href="./category/bar.html">bar</a></li>
+                </ul></nav>
         </header><!-- /#banner -->
-        <section id="content" class="body">
+<section id="content" class="body">
   <article>
     <header>
       <h1 class="entry-title">
         <a href="./unbelievable.html" rel="bookmark"
            title="Permalink to Unbelievable !">Unbelievable !</a></h1>
-          </header>
+    </header>
 
     <div class="entry-content">
-      <footer class="post-info">
+<footer class="post-info">
         <abbr class="published" title="2010-10-15T20:30:00">
                 Fri 15 October 2010
         </abbr>
 
-                <address class="vcard author">
+        <address class="vcard author">
                 By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
         </address>
-        <p>In <a href="./category/misc.html">misc</a>. </p>
+<p>In <a href="./category/misc.html">misc</a>. </p>
 
 </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
 <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
 <a class="reference external" href="./a-markdown-powered-article.html">a file-relative link to markdown-article</a></p>
 
     </div><!-- /.entry-content -->
-        <div class="comments">
+    <div class="comments">
       <h2>Comments !</h2>
       <div id="disqus_thread"></div>
       <script type="text/javascript">
@@ -64,33 +64,33 @@
         })();
       </script>
     </div>
-    
+
   </article>
 </section>
         <section id="extras" class="body">
-                        <div class="blogroll">
+                <div class="blogroll">
                         <h2>blogroll</h2>
                         <ul>
-                                                    <li><a href="http://biologeek.org">Biologeek</a></li>
-                                                    <li><a href="http://filyb.info/">Filyb</a></li>
-                                                    <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
-                                                    <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
-                                                    <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
-                                                    <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
-                                                </ul>
+                            <li><a href="http://biologeek.org">Biologeek</a></li>
+                            <li><a href="http://filyb.info/">Filyb</a></li>
+                            <li><a href="http://www.libert-fr.com">Libert-fr</a></li>
+                            <li><a href="http://prendreuncafe.com/blog/">N1k0</a></li>
+                            <li><a href="http://ziade.org/blog">Tarek Ziadé</a></li>
+                            <li><a href="http://zubin71.wordpress.com/">Zubin Mithra</a></li>
+                        </ul>
                 </div><!-- /.blogroll -->
-                                <div class="social">
+                <div class="social">
                         <h2>social</h2>
                         <ul>
                             <li><a href="http://blog.notmyidea.org/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
-                                                        <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
-                            
-                                                    <li><a href="http://twitter.com/ametaireau">twitter</a></li>
-                                                    <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
-                                                    <li><a href="http://github.com/ametaireau">github</a></li>
-                                                </ul>
+                            <li><a href="http://blog.notmyidea.org/feeds/all.rss.xml" type="application/rss+xml" rel="alternate">rss feed</a></li>
+
+                            <li><a href="http://twitter.com/ametaireau">twitter</a></li>
+                            <li><a href="http://lastfm.com/user/akounet">lastfm</a></li>
+                            <li><a href="http://github.com/ametaireau">github</a></li>
+                        </ul>
                 </div><!-- /.social -->
-                </section><!-- /#extras -->
+        </section><!-- /#extras -->
 
         <footer id="contentinfo" class="body">
                 <address id="about" class="vcard body">