From 76fa4576547cb01d4bfecbd7d40cd70dca7b44d2 Mon Sep 17 00:00:00 2001
From: Justin Mayer <entroP@gmail.com>
Date: Sat, 3 Aug 2013 16:17:26 -0700
Subject: [PATCH] Normalize whitespace via lstrip Jinja parameter

This adds the lstrip_blocks Jinja parameter and removes unnecessary
whitespace from a few notmyidea templates.

Note: The lstrip_blocks parameter requires Jinja 2.7+, which has been
noted in Pelican's setup.py.

Credit for this commit goes entirely to Russ Webber, who has earned my
eternal thanks for discovering and applying this useful Jinja parameter.

Refs #969
---
 pelican/generators.py                         |   1 +
 .../basic/a-markdown-powered-article.html     |  36 ++---
 pelican/tests/output/basic/archives.html      |  28 ++--
 pelican/tests/output/basic/article-1.html     |  36 ++---
 pelican/tests/output/basic/article-2.html     |  36 ++---
 pelican/tests/output/basic/article-3.html     |  36 ++---
 .../output/basic/author/alexis-metaireau.html |  62 ++++---
 pelican/tests/output/basic/categories.html    |  28 ++--
 pelican/tests/output/basic/category/bar.html  |  46 +++---
 pelican/tests/output/basic/category/cat1.html |  82 +++++-----
 pelican/tests/output/basic/category/misc.html |  76 ++++-----
 pelican/tests/output/basic/category/yeah.html |  46 +++---
 .../basic/filename_metadata-example.html      |  36 ++---
 pelican/tests/output/basic/index.html         | 152 ++++++++----------
 pelican/tests/output/basic/oh-yeah.html       |  38 ++---
 .../tests/output/basic/override/index.html    |  33 ++--
 .../pages/this-is-a-test-hidden-page.html     |  33 ++--
 .../basic/pages/this-is-a-test-page.html      |  33 ++--
 .../tests/output/basic/second-article-fr.html |  42 ++---
 .../tests/output/basic/second-article.html    |  42 ++---
 pelican/tests/output/basic/tag/bar.html       |  80 +++++----
 pelican/tests/output/basic/tag/baz.html       |  50 +++---
 pelican/tests/output/basic/tag/foo.html       |  66 ++++----
 pelican/tests/output/basic/tag/foobar.html    |  46 +++---
 pelican/tests/output/basic/tag/oh.html        |  46 +++---
 pelican/tests/output/basic/tag/yeah.html      |  46 +++---
 .../output/basic/this-is-a-super-article.html |  38 ++---
 pelican/tests/output/basic/unbelievable.html  |  36 ++---
 .../custom/a-markdown-powered-article.html    |  66 ++++----
 pelican/tests/output/custom/archives.html     |  54 +++----
 pelican/tests/output/custom/article-1.html    |  66 ++++----
 pelican/tests/output/custom/article-2.html    |  66 ++++----
 pelican/tests/output/custom/article-3.html    |  66 ++++----
 .../custom/author/alexis-metaireau.html       | 124 +++++++-------
 .../custom/author/alexis-metaireau2.html      | 139 ++++++++--------
 .../custom/author/alexis-metaireau3.html      |  83 +++++-----
 pelican/tests/output/custom/categories.html   |  54 +++----
 pelican/tests/output/custom/category/bar.html |  84 +++++-----
 .../tests/output/custom/category/cat1.html    | 122 +++++++-------
 .../tests/output/custom/category/misc.html    | 114 +++++++------
 .../tests/output/custom/category/yeah.html    |  78 +++++----
 .../output/custom/drafts/a-draft-article.html |  64 ++++----
 .../custom/filename_metadata-example.html     |  66 ++++----
 pelican/tests/output/custom/index.html        | 130 +++++++--------
 pelican/tests/output/custom/index2.html       | 133 +++++++--------
 pelican/tests/output/custom/index3.html       |  83 +++++-----
 .../tests/output/custom/jinja2_template.html  |  54 +++----
 pelican/tests/output/custom/oh-yeah-fr.html   |  72 ++++-----
 pelican/tests/output/custom/oh-yeah.html      |  72 ++++-----
 .../tests/output/custom/override/index.html   |  59 ++++---
 .../pages/this-is-a-test-hidden-page.html     |  59 ++++---
 .../custom/pages/this-is-a-test-page.html     |  59 ++++---
 .../output/custom/second-article-fr.html      |  72 ++++-----
 .../tests/output/custom/second-article.html   |  72 ++++-----
 pelican/tests/output/custom/tag/bar.html      | 120 +++++++-------
 pelican/tests/output/custom/tag/baz.html      |  84 +++++-----
 pelican/tests/output/custom/tag/foo.html      | 100 ++++++------
 pelican/tests/output/custom/tag/foobar.html   |  78 +++++----
 pelican/tests/output/custom/tag/oh.html       |  84 +++++-----
 pelican/tests/output/custom/tag/yeah.html     |  84 +++++-----
 .../custom/this-is-a-super-article.html       |  66 ++++----
 pelican/tests/output/custom/unbelievable.html |  66 ++++----
 pelican/themes/notmyidea/templates/index.html |  16 +-
 pelican/themes/notmyidea/templates/page.html  |   4 +-
 .../notmyidea/templates/translations.html     |   2 +-
 setup.py                                      |   2 +-
 66 files changed, 2004 insertions(+), 2143 deletions(-)

diff --git a/pelican/generators.py b/pelican/generators.py
index 166ff616..13909743 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 29c6d0d6..6f854ae4 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 9edb3c1b..7a10cc9d 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 eee7adfe..3d55751d 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 5449a8be..4ae3e2f3 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 55449726..9b978ec0 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 1c67b6fa..04a89930 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<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 +44,46 @@ 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 7a85b52a..f1541892 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 78894c94..f272dd2b 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<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 +44,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 43226146..4e2f0f5a 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,104 @@
         <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">
+                    <h1 class="entry-title"><a href="/a-markdown-powered-article.html">A markdown powered article</a></h1>
+<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 4aebcdf1..fce85481 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,87 @@
         <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">
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<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>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>
-    
+<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>
+
 </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 b6f59771..b7c383fa 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+<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 +50,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 4ceef81f..a9f548a5 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 49c1883c..b10b479a 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,176 @@
         <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">
+                    <h1 class="entry-title"><a href="/filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<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>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>
-    
+<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>
+
 </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 +194,41 @@ 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 498e9cac..cb29ea80 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 2cc639d2..ff6775cf 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,30 @@
         <header id="banner" class="body">
                 <h1><a href="/">A Pelican Blog </a></h1>
                 <nav><ul>
-                                                    <li class="active"><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 class="active"><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 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 cd582b96..e4a18249 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,30 @@
         <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 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 8ba85e1d..d0e11cfc 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,30 @@
         <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 class="active"><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 class="active"><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 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 44965a76..ca4abcfc 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>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>
-    
+<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>
+
 </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 780d9b20..7008b847 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>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>
-    
+<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>
+
 </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 e23071e8..80d2d212 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,75 @@
         <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">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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 +93,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 e429b6d8..6c25194d 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,41 @@
         <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">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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 17fac77a..87372eb6 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,69 @@
         <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">
+                    <h1 class="entry-title"><a href="/second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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 cb8dfec2..4812467f 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/this-is-a-super-article.html">This is a super article !</a></h1>
+<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 +50,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 f79e6e0e..47ef8946 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<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 +44,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 dc3c1212..47f8076a 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="/oh-yeah.html">Oh yeah !</a></h1>
+<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 +44,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 85ad0ad8..e472a8e2 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 3cc9a557..849b4d78 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 6a2f1fc5..c5fca991 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 b1704bdb..077c1268 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 c77bd4cf..80f1ceaf 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 f93b8a85..8511afc8 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 c87abf66..305359b9 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 dd699031..e732fdcc 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,135 @@
         <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">
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+<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 be78ff62..d984d5e7 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,59 @@
         <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>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>
-    
+<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>
+
 </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 +80,88 @@ 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>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>
-    
+<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>
+
 </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 bc13ee21..bfb02d92 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,71 @@
         <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 ddbc1832..76f7aaca 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 4198d868..71ca6213 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,30 @@
         <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">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<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>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>
-    
+<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>
+
 </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 +50,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 50a7a80b..e91ff166 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,134 @@
         <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">
+                    <h1 class="entry-title"><a href="../a-markdown-powered-article.html">A markdown powered article</a></h1>
+<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 f2afbaeb..f87abede 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,114 @@
         <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">
+                    <h1 class="entry-title"><a href="../filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<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>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>
-    
+<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>
+
 </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 fa3e018f..1a5db423 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+<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 +54,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 40854732..0bfbc1d6 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 db0e2b19..a9c0f5c1 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 68f51f06..92aef088 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,137 @@
         <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">
+                    <h1 class="entry-title"><a href="./filename_metadata-example.html">FILENAME_METADATA example</a></h1>
+<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>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>
-    
+<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>
+
 </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 e85dd580..2355c7a1 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,106 @@
         <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>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>
-    
+<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>
+
 </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 +127,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 af973106..8121e987 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,71 @@
         <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 fcd60de6..0f0eee83 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 f18d3f07..2590eb3b 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>
-Translations: 
-            <a href="./oh-yeah.html">en</a>
-    
+<p>In <a href="./category/misc.html">misc</a>. </p>
+Translations:
+        <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 c0e77d00..d1c70eeb 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>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>
-    
+<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>
+
 </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 ca8490d6..1042dbb0 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,45 @@
         <header id="banner" class="body">
                 <h1><a href="../">Alexis' log </a></h1>
                 <nav><ul>
-                                                    <li class="active"><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 class="active"><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 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 89275001..d9b3851c 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,45 @@
         <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 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 d969d152..d6dedd9a 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,45 @@
         <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 class="active"><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 class="active"><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 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 16ca3cc9..0ac5c01c 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>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>
-    
+<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>
+
 </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 4740eded..289a6308 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>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>
-    
+<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>
+
 </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 5f26883b..2f6a1016 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,81 @@
         <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">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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>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>
-    
+<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>
+
 </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 +102,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 46aa6095..cf4fb3f6 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,62 @@
         <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">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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 04d37f1b..b6c741bd 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,90 @@
         <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">
+                    <h1 class="entry-title"><a href="../second-article.html">Second article</a></h1>
+<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>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>
-    
+<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>
+
 </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 961e381a..cdecccd7 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,27 @@
         <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">
+                    <h1 class="entry-title"><a href="../this-is-a-super-article.html">This is a super article !</a></h1>
+<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 +54,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 5452f4d3..d3bde1dc 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,30 @@
         <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">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<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>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>
-    
+<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>
+
 </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 +50,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 d71c8a37..ba6089f0 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,30 @@
         <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">
+                    <h1 class="entry-title"><a href="../oh-yeah.html">Oh yeah !</a></h1>
+<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>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>
-    
+<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>
+
 </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 +50,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 8d9df71b..d1faa0ca 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 ee743526..efd049f0 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">
diff --git a/pelican/themes/notmyidea/templates/index.html b/pelican/themes/notmyidea/templates/index.html
index 8752a6b6..2d45bb2a 100644
--- a/pelican/themes/notmyidea/templates/index.html
+++ b/pelican/themes/notmyidea/templates/index.html
@@ -1,14 +1,14 @@
 {% extends "base.html" %}
 {% block content_title %}{% endblock %}
-{% block content %}        
+{% block content %}
 {% if articles %}
-    {% for article in articles_page.object_list %}        
+    {% for article in articles_page.object_list %}
 
         {# First item #}
         {% if loop.first and not articles_page.has_previous() %}
             <aside id="featured" class="body">
                 <article>
-                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1> 
+                    <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
                     {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
                 </article>
                 {% if loop.length == 1 %}
@@ -22,17 +22,17 @@
                     <ol id="posts-list" class="hfeed">
             {% endif %}
         {# other items #}
-        {% else %} 
+        {% else %}
             {% if loop.first and articles_page.has_previous %}
                 <section id="content" class="body">
                     <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
             {% endif %}
-            <li><article class="hentry">    
+            <li><article class="hentry">
                 <header>
                     <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
                            title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
                 </header>
-                
+
                 <div class="entry-content">
                 {% include 'article_infos.html' %}
                 {{ article.summary }}
@@ -43,7 +43,7 @@
         {% endif %}
         {% if loop.last %}
             </ol><!-- /#posts-list -->
-            {% if loop.last and (articles_page.has_previous() 
+            {% if loop.last and (articles_page.has_previous()
             or not articles_page.has_previous() and loop.length > 1) %}
                 {% include 'pagination.html' %}
             {% endif %}
@@ -51,7 +51,7 @@
         {% endif %}
     {% endfor %}
 {% else %}
-<section id="content" class="body">    
+<section id="content" class="body">
 <h2>Pages</h2>
     {% for page in PAGES %}
         <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
diff --git a/pelican/themes/notmyidea/templates/page.html b/pelican/themes/notmyidea/templates/page.html
index 60409d5c..5ac50b66 100644
--- a/pelican/themes/notmyidea/templates/page.html
+++ b/pelican/themes/notmyidea/templates/page.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block title %}{{ page.title }}{% endblock %}
-{% block content %}        
-<section id="content" class="body">    
+{% block content %}
+<section id="content" class="body">
     <h1 class="entry-title">{{ page.title }}</h1>
     {% import 'translations.html' as translations with context %}
     {{ translations.translations_for(page) }}
diff --git a/pelican/themes/notmyidea/templates/translations.html b/pelican/themes/notmyidea/templates/translations.html
index ca03a2c9..7894bb07 100644
--- a/pelican/themes/notmyidea/templates/translations.html
+++ b/pelican/themes/notmyidea/templates/translations.html
@@ -1,6 +1,6 @@
 {% macro translations_for(article) %}
 {% if article.translations %}
-Translations: 
+Translations:
     {% for translation in article.translations %}
         <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
     {% endfor %}
diff --git a/setup.py b/setup.py
index 83beb461..69f76b3c 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
+requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
             'pytz', 'blinker', 'unidecode', 'six']
 
 entry_points = {