diff --git a/pelican/tests/output/basic/a-markdown-powered-article.html b/pelican/tests/output/basic/a-markdown-powered-article.html
index 0098ccac5..3c2821f18 100644
--- a/pelican/tests/output/basic/a-markdown-powered-article.html
+++ b/pelican/tests/output/basic/a-markdown-powered-article.html
@@ -65,4 +65,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/archives.html b/pelican/tests/output/basic/archives.html
index e3a6c7df4..3218fe1d1 100644
--- a/pelican/tests/output/basic/archives.html
+++ b/pelican/tests/output/basic/archives.html
@@ -67,4 +67,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-1.html b/pelican/tests/output/basic/article-1.html
index 961ad390a..91dcff191 100644
--- a/pelican/tests/output/basic/article-1.html
+++ b/pelican/tests/output/basic/article-1.html
@@ -64,4 +64,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-2.html b/pelican/tests/output/basic/article-2.html
index e5389d35d..e3ad5724f 100644
--- a/pelican/tests/output/basic/article-2.html
+++ b/pelican/tests/output/basic/article-2.html
@@ -64,4 +64,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/article-3.html b/pelican/tests/output/basic/article-3.html
index d23e5da28..2ec3f1e7d 100644
--- a/pelican/tests/output/basic/article-3.html
+++ b/pelican/tests/output/basic/article-3.html
@@ -64,4 +64,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/author/alexis-metaireau.html b/pelican/tests/output/basic/author/alexis-metaireau.html
index 12e05ec82..d682ab29f 100644
--- a/pelican/tests/output/basic/author/alexis-metaireau.html
+++ b/pelican/tests/output/basic/author/alexis-metaireau.html
@@ -109,4 +109,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/authors.html b/pelican/tests/output/basic/authors.html
index cff1360b1..86d2249aa 100644
--- a/pelican/tests/output/basic/authors.html
+++ b/pelican/tests/output/basic/authors.html
@@ -49,4 +49,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/categories.html b/pelican/tests/output/basic/categories.html
index cc54f4a32..86606fbe1 100644
--- a/pelican/tests/output/basic/categories.html
+++ b/pelican/tests/output/basic/categories.html
@@ -52,4 +52,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/bar.html b/pelican/tests/output/basic/category/bar.html
index 1f9c0d8dd..c4f57bddb 100644
--- a/pelican/tests/output/basic/category/bar.html
+++ b/pelican/tests/output/basic/category/bar.html
@@ -65,4 +65,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/cat1.html b/pelican/tests/output/basic/category/cat1.html
index ca47821b2..a291aae4e 100644
--- a/pelican/tests/output/basic/category/cat1.html
+++ b/pelican/tests/output/basic/category/cat1.html
@@ -122,4 +122,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/misc.html b/pelican/tests/output/basic/category/misc.html
index 584900018..fa7869102 100644
--- a/pelican/tests/output/basic/category/misc.html
+++ b/pelican/tests/output/basic/category/misc.html
@@ -133,4 +133,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/category/yeah.html b/pelican/tests/output/basic/category/yeah.html
index 815d42e4f..caade72e6 100644
--- a/pelican/tests/output/basic/category/yeah.html
+++ b/pelican/tests/output/basic/category/yeah.html
@@ -73,4 +73,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
index 5a2d367b1..45bc00ec1 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article-without-date.html
@@ -34,7 +34,7 @@ <h1 class="entry-title">
     <div class="entry-content">
 <footer class="post-info">
         <abbr class="published" title="9999-12-31T23:59:59.999999+00:00">
-                Published: 
+                Published:
         </abbr>
 
 <p>In <a href="/category/misc.html">misc</a>.</p>
@@ -65,4 +65,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/drafts/a-draft-article.html b/pelican/tests/output/basic/drafts/a-draft-article.html
index a0bed2415..9349064c2 100644
--- a/pelican/tests/output/basic/drafts/a-draft-article.html
+++ b/pelican/tests/output/basic/drafts/a-draft-article.html
@@ -65,4 +65,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
index 8f9a85fab..a0306a0b1 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.atom.xml
@@ -19,4 +19,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
index 1af41d472..d4989286c 100644
--- a/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/basic/feeds/alexis-metaireau.rss.xml
@@ -7,4 +7,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0000</pubDate><guid isPermaLink="false">tag:None,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
index 9c44c8602..49c76c624 100644
--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all-fr.atom.xml b/pelican/tests/output/basic/feeds/all-fr.atom.xml
index 4ecf7534b..bca3d2cbc 100644
--- a/pelican/tests/output/basic/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/basic/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>A Pelican Blog</title><link href="/" rel="alternate"></link><link href="/feeds/all-fr.atom.xml" rel="self"></link><id>/</id><updated>2012-02-29T00:00:00+00:00</updated><entry><title>Deuxième article</title><link href="/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+00:00</published><updated>2012-02-29T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+00:00</published><updated>2010-10-20T10:14:00+00:00</updated><author><name></name></author><id>tag:None,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
index e9dceb69a..b2399afe2 100644
--- a/pelican/tests/output/basic/feeds/all.atom.xml
+++ b/pelican/tests/output/basic/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/bar.atom.xml b/pelican/tests/output/basic/feeds/bar.atom.xml
index edd1170a0..93fff29cb 100644
--- a/pelican/tests/output/basic/feeds/bar.atom.xml
+++ b/pelican/tests/output/basic/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/cat1.atom.xml b/pelican/tests/output/basic/feeds/cat1.atom.xml
index 8516b95c1..2f054a1c1 100644
--- a/pelican/tests/output/basic/feeds/cat1.atom.xml
+++ b/pelican/tests/output/basic/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+00:00</published><updated>2011-02-17T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
index a307ac4e3..9127b2a57 100644
--- a/pelican/tests/output/basic/feeds/misc.atom.xml
+++ b/pelican/tests/output/basic/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+00:00</published><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:None,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/basic/feeds/yeah.atom.xml b/pelican/tests/output/basic/feeds/yeah.atom.xml
index 6f871915e..6411bf6db 100644
--- a/pelican/tests/output/basic/feeds/yeah.atom.xml
+++ b/pelican/tests/output/basic/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/basic/filename_metadata-example.html b/pelican/tests/output/basic/filename_metadata-example.html
index f3ae9cea1..30da64fdc 100644
--- a/pelican/tests/output/basic/filename_metadata-example.html
+++ b/pelican/tests/output/basic/filename_metadata-example.html
@@ -64,4 +64,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/index.html b/pelican/tests/output/basic/index.html
index fd334d38b..db95e29b7 100644
--- a/pelican/tests/output/basic/index.html
+++ b/pelican/tests/output/basic/index.html
@@ -272,4 +272,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah-fr.html b/pelican/tests/output/basic/oh-yeah-fr.html
index 3fdfeae93..388cc283d 100644
--- a/pelican/tests/output/basic/oh-yeah-fr.html
+++ b/pelican/tests/output/basic/oh-yeah-fr.html
@@ -68,4 +68,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/oh-yeah.html b/pelican/tests/output/basic/oh-yeah.html
index f8d3d227c..186a3c84d 100644
--- a/pelican/tests/output/basic/oh-yeah.html
+++ b/pelican/tests/output/basic/oh-yeah.html
@@ -76,4 +76,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/override/index.html b/pelican/tests/output/basic/override/index.html
index a74d802fc..1b7c404bb 100644
--- a/pelican/tests/output/basic/override/index.html
+++ b/pelican/tests/output/basic/override/index.html
@@ -24,7 +24,7 @@ <h1><a href="/">A Pelican Blog</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -48,4 +48,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
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 1c8362011..fda32c01b 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
@@ -24,7 +24,7 @@ <h1><a href="/">A Pelican Blog</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -48,4 +48,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
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 372eff769..b79f424db 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
@@ -24,7 +24,7 @@ <h1><a href="/">A Pelican Blog</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="/pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -49,4 +49,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article-fr.html b/pelican/tests/output/basic/second-article-fr.html
index 514c5585a..e70f16e5c 100644
--- a/pelican/tests/output/basic/second-article-fr.html
+++ b/pelican/tests/output/basic/second-article-fr.html
@@ -68,4 +68,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/second-article.html b/pelican/tests/output/basic/second-article.html
index 365f99cd0..4c833a499 100644
--- a/pelican/tests/output/basic/second-article.html
+++ b/pelican/tests/output/basic/second-article.html
@@ -68,4 +68,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/bar.html b/pelican/tests/output/basic/tag/bar.html
index 047d772a3..d2824c2e5 100644
--- a/pelican/tests/output/basic/tag/bar.html
+++ b/pelican/tests/output/basic/tag/bar.html
@@ -121,4 +121,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/baz.html b/pelican/tests/output/basic/tag/baz.html
index 515186202..01cb257e1 100644
--- a/pelican/tests/output/basic/tag/baz.html
+++ b/pelican/tests/output/basic/tag/baz.html
@@ -64,4 +64,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foo.html b/pelican/tests/output/basic/tag/foo.html
index 0214cf268..bdabf1315 100644
--- a/pelican/tests/output/basic/tag/foo.html
+++ b/pelican/tests/output/basic/tag/foo.html
@@ -91,4 +91,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/foobar.html b/pelican/tests/output/basic/tag/foobar.html
index ab07e87f5..00b727902 100644
--- a/pelican/tests/output/basic/tag/foobar.html
+++ b/pelican/tests/output/basic/tag/foobar.html
@@ -73,4 +73,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/oh.html b/pelican/tests/output/basic/tag/oh.html
index f3af2a2f7..c675834b7 100644
--- a/pelican/tests/output/basic/tag/oh.html
+++ b/pelican/tests/output/basic/tag/oh.html
@@ -24,7 +24,7 @@ <h1><a href="/">A Pelican Blog</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -47,4 +47,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tag/yeah.html b/pelican/tests/output/basic/tag/yeah.html
index f04affa8f..99806970b 100644
--- a/pelican/tests/output/basic/tag/yeah.html
+++ b/pelican/tests/output/basic/tag/yeah.html
@@ -65,4 +65,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/tags.html b/pelican/tests/output/basic/tags.html
index db5d66348..4d82ca7ba 100644
--- a/pelican/tests/output/basic/tags.html
+++ b/pelican/tests/output/basic/tags.html
@@ -54,4 +54,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/theme/css/reset.css b/pelican/tests/output/basic/theme/css/reset.css
index c88e6196c..f5123cf68 100644
--- a/pelican/tests/output/basic/theme/css/reset.css
+++ b/pelican/tests/output/basic/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710f..c70bcad3d 100644
--- a/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/basic/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
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 6ac686642..52e0bf650 100644
--- a/pelican/tests/output/basic/this-is-a-super-article.html
+++ b/pelican/tests/output/basic/this-is-a-super-article.html
@@ -82,4 +82,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
index d87c31ea1..710c8ff7e 100644
--- a/pelican/tests/output/basic/unbelievable.html
+++ b/pelican/tests/output/basic/unbelievable.html
@@ -96,4 +96,4 @@ <h2>social</h2>
         </footer><!-- /#contentinfo -->
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/a-markdown-powered-article.html b/pelican/tests/output/custom/a-markdown-powered-article.html
index 422421d85..3cf1deb73 100644
--- a/pelican/tests/output/custom/a-markdown-powered-article.html
+++ b/pelican/tests/output/custom/a-markdown-powered-article.html
@@ -111,4 +111,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/archives.html b/pelican/tests/output/custom/archives.html
index 34c3f4cd6..6cf7b82d7 100644
--- a/pelican/tests/output/custom/archives.html
+++ b/pelican/tests/output/custom/archives.html
@@ -95,4 +95,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-1.html b/pelican/tests/output/custom/article-1.html
index 226489ea5..e28fb39b3 100644
--- a/pelican/tests/output/custom/article-1.html
+++ b/pelican/tests/output/custom/article-1.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-2.html b/pelican/tests/output/custom/article-2.html
index 1a8358499..8c33fe864 100644
--- a/pelican/tests/output/custom/article-2.html
+++ b/pelican/tests/output/custom/article-2.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/article-3.html b/pelican/tests/output/custom/article-3.html
index c3076e985..158622705 100644
--- a/pelican/tests/output/custom/article-3.html
+++ b/pelican/tests/output/custom/article-3.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau.html b/pelican/tests/output/custom/author/alexis-metaireau.html
index aef8c6e6a..22a23340d 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau.html
@@ -171,4 +171,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau2.html b/pelican/tests/output/custom/author/alexis-metaireau2.html
index 8d17eed51..e5f7e953f 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau2.html
@@ -186,4 +186,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/author/alexis-metaireau3.html b/pelican/tests/output/custom/author/alexis-metaireau3.html
index 48fe75bae..c51627376 100644
--- a/pelican/tests/output/custom/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom/author/alexis-metaireau3.html
@@ -136,4 +136,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/authors.html b/pelican/tests/output/custom/authors.html
index de18662eb..06919fb7f 100644
--- a/pelican/tests/output/custom/authors.html
+++ b/pelican/tests/output/custom/authors.html
@@ -77,4 +77,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/categories.html b/pelican/tests/output/custom/categories.html
index b558d389b..34236cdb4 100644
--- a/pelican/tests/output/custom/categories.html
+++ b/pelican/tests/output/custom/categories.html
@@ -80,4 +80,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/bar.html b/pelican/tests/output/custom/category/bar.html
index 6f3e9f5b6..ad1ef940e 100644
--- a/pelican/tests/output/custom/category/bar.html
+++ b/pelican/tests/output/custom/category/bar.html
@@ -93,4 +93,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/cat1.html b/pelican/tests/output/custom/category/cat1.html
index d9b1e41f5..79428cd70 100644
--- a/pelican/tests/output/custom/category/cat1.html
+++ b/pelican/tests/output/custom/category/cat1.html
@@ -162,4 +162,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/misc.html b/pelican/tests/output/custom/category/misc.html
index 7cc5bf9bc..16c312529 100644
--- a/pelican/tests/output/custom/category/misc.html
+++ b/pelican/tests/output/custom/category/misc.html
@@ -173,4 +173,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/category/yeah.html b/pelican/tests/output/custom/category/yeah.html
index 957c76ae3..e919ddd58 100644
--- a/pelican/tests/output/custom/category/yeah.html
+++ b/pelican/tests/output/custom/category/yeah.html
@@ -101,4 +101,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
index 94d2c8e9f..81137fc7e 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article-without-date.html
@@ -96,4 +96,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/drafts/a-draft-article.html b/pelican/tests/output/custom/drafts/a-draft-article.html
index c926c14f2..260ccaf1b 100644
--- a/pelican/tests/output/custom/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom/drafts/a-draft-article.html
@@ -96,4 +96,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
index f6cde37e0..5bfb73d0c 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
index c13a742bb..b56546827 100644
--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
@@ -26,4 +26,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
index 703f56f0a..1aac415a3 100644
--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all-fr.atom.xml b/pelican/tests/output/custom/feeds/all-fr.atom.xml
index 39565ca67..68ebd7383 100644
--- a/pelican/tests/output/custom/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><subtitle>A personal blog.</subtitle><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
index de5e733d7..dbe37a322 100644
--- a/pelican/tests/output/custom/feeds/all.atom.xml
+++ b/pelican/tests/output/custom/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
index a8d984fa0..45a8dc589 100644
--- a/pelican/tests/output/custom/feeds/all.rss.xml
+++ b/pelican/tests/output/custom/feeds/all.rss.xml
@@ -28,4 +28,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/bar.atom.xml b/pelican/tests/output/custom/feeds/bar.atom.xml
index 002de0371..d79aad2d8 100644
--- a/pelican/tests/output/custom/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/bar.rss.xml b/pelican/tests/output/custom/feeds/bar.rss.xml
index 53035e710..c993753ac 100644
--- a/pelican/tests/output/custom/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/oh-yeah.html</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/cat1.atom.xml b/pelican/tests/output/custom/feeds/cat1.atom.xml
index e8ed355bc..c44ac595a 100644
--- a/pelican/tests/output/custom/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/article-1.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-1.html</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/article-2.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-2.html</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/article-3.html" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/article-3.html</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/cat1.rss.xml b/pelican/tests/output/custom/feeds/cat1.rss.xml
index 9951b2936..a6ca0b538 100644
--- a/pelican/tests/output/custom/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/unbelievable.html"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/a-markdown-powered-article.html</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/article-1.html</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-1.html</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/article-2.html</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-2.html</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/article-3.html</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/article-3.html</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
index a260f67d6..117c2bc24 100644
--- a/pelican/tests/output/custom/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
index 828eae624..03b3b2feb 100644
--- a/pelican/tests/output/custom/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom/feeds/misc.rss.xml
@@ -13,4 +13,4 @@
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/unbelievable.html</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/feeds/yeah.atom.xml b/pelican/tests/output/custom/feeds/yeah.atom.xml
index 127ab5903..0e5e88581 100644
--- a/pelican/tests/output/custom/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom/feeds/yeah.rss.xml b/pelican/tests/output/custom/feeds/yeah.rss.xml
index 98b820ec3..be592f111 100644
--- a/pelican/tests/output/custom/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description>A personal blog.</description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/this-is-a-super-article.html</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/this-is-a-super-article.html</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom/filename_metadata-example.html b/pelican/tests/output/custom/filename_metadata-example.html
index 70d41179d..8bc1babb6 100644
--- a/pelican/tests/output/custom/filename_metadata-example.html
+++ b/pelican/tests/output/custom/filename_metadata-example.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index.html b/pelican/tests/output/custom/index.html
index 6c4d7a94a..d97eb4c4a 100644
--- a/pelican/tests/output/custom/index.html
+++ b/pelican/tests/output/custom/index.html
@@ -171,4 +171,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index2.html b/pelican/tests/output/custom/index2.html
index 043f8c334..11943a88b 100644
--- a/pelican/tests/output/custom/index2.html
+++ b/pelican/tests/output/custom/index2.html
@@ -186,4 +186,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/index3.html b/pelican/tests/output/custom/index3.html
index f8ebaac04..72ac69c63 100644
--- a/pelican/tests/output/custom/index3.html
+++ b/pelican/tests/output/custom/index3.html
@@ -136,4 +136,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/jinja2_template.html b/pelican/tests/output/custom/jinja2_template.html
index 27a6df8e8..71a9e63ae 100644
--- a/pelican/tests/output/custom/jinja2_template.html
+++ b/pelican/tests/output/custom/jinja2_template.html
@@ -72,4 +72,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/oh-yeah-fr.html b/pelican/tests/output/custom/oh-yeah-fr.html
index f30c9b634..555af6c01 100644
--- a/pelican/tests/output/custom/oh-yeah-fr.html
+++ b/pelican/tests/output/custom/oh-yeah-fr.html
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/oh-yeah.html b/pelican/tests/output/custom/oh-yeah.html
index 20b903514..661d01531 100644
--- a/pelican/tests/output/custom/oh-yeah.html
+++ b/pelican/tests/output/custom/oh-yeah.html
@@ -119,4 +119,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/override/index.html b/pelican/tests/output/custom/override/index.html
index 9d1c4f46a..094939383 100644
--- a/pelican/tests/output/custom/override/index.html
+++ b/pelican/tests/output/custom/override/index.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -76,4 +76,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
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 bd0d03ed8..6eb578c9e 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
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -76,4 +76,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
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 16d17c3b7..db9776945 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
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -77,4 +77,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/second-article-fr.html b/pelican/tests/output/custom/second-article-fr.html
index ff7af42d0..276387379 100644
--- a/pelican/tests/output/custom/second-article-fr.html
+++ b/pelican/tests/output/custom/second-article-fr.html
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/second-article.html b/pelican/tests/output/custom/second-article.html
index a71df8cfa..2ed7c8227 100644
--- a/pelican/tests/output/custom/second-article.html
+++ b/pelican/tests/output/custom/second-article.html
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/bar.html b/pelican/tests/output/custom/tag/bar.html
index 719ea12a6..bc949e115 100644
--- a/pelican/tests/output/custom/tag/bar.html
+++ b/pelican/tests/output/custom/tag/bar.html
@@ -152,4 +152,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/baz.html b/pelican/tests/output/custom/tag/baz.html
index 048dc5ce3..bb61b7875 100644
--- a/pelican/tests/output/custom/tag/baz.html
+++ b/pelican/tests/output/custom/tag/baz.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foo.html b/pelican/tests/output/custom/tag/foo.html
index 637bce0bf..4edfe4324 100644
--- a/pelican/tests/output/custom/tag/foo.html
+++ b/pelican/tests/output/custom/tag/foo.html
@@ -122,4 +122,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/foobar.html b/pelican/tests/output/custom/tag/foobar.html
index 296ee0982..cebd52f4f 100644
--- a/pelican/tests/output/custom/tag/foobar.html
+++ b/pelican/tests/output/custom/tag/foobar.html
@@ -101,4 +101,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/oh.html b/pelican/tests/output/custom/tag/oh.html
index 4a7ce4390..4723075fd 100644
--- a/pelican/tests/output/custom/tag/oh.html
+++ b/pelican/tests/output/custom/tag/oh.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log <strong>A personal blog.</strong></a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -75,4 +75,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tag/yeah.html b/pelican/tests/output/custom/tag/yeah.html
index 78618480b..c3e3bb4ab 100644
--- a/pelican/tests/output/custom/tag/yeah.html
+++ b/pelican/tests/output/custom/tag/yeah.html
@@ -93,4 +93,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/tags.html b/pelican/tests/output/custom/tags.html
index 1a8ef5720..17feabf97 100644
--- a/pelican/tests/output/custom/tags.html
+++ b/pelican/tests/output/custom/tags.html
@@ -82,4 +82,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/theme/css/reset.css b/pelican/tests/output/custom/theme/css/reset.css
index c88e6196c..f5123cf68 100644
--- a/pelican/tests/output/custom/theme/css/reset.css
+++ b/pelican/tests/output/custom/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710f..c70bcad3d 100644
--- a/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/custom/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The
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 ab9dc16f0..565d9f3f5 100644
--- a/pelican/tests/output/custom/this-is-a-super-article.html
+++ b/pelican/tests/output/custom/this-is-a-super-article.html
@@ -125,4 +125,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
index a7ad0efaa..6153392e8 100644
--- a/pelican/tests/output/custom/unbelievable.html
+++ b/pelican/tests/output/custom/unbelievable.html
@@ -142,4 +142,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/archives.html b/pelican/tests/output/custom_locale/archives.html
index 25ef1c6c8..8b07609d5 100644
--- a/pelican/tests/output/custom_locale/archives.html
+++ b/pelican/tests/output/custom_locale/archives.html
@@ -95,4 +95,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau.html b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
index df76ccf65..86ee74166 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau.html
@@ -171,4 +171,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
index 42a929d08..cf332f972 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau2.html
@@ -186,4 +186,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
index 941cdc46a..dff225d24 100644
--- a/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
+++ b/pelican/tests/output/custom_locale/author/alexis-metaireau3.html
@@ -136,4 +136,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/authors.html b/pelican/tests/output/custom_locale/authors.html
index 0907ff7cb..7cac21ccc 100644
--- a/pelican/tests/output/custom_locale/authors.html
+++ b/pelican/tests/output/custom_locale/authors.html
@@ -77,4 +77,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/categories.html b/pelican/tests/output/custom_locale/categories.html
index 01dc680a3..3b102a032 100644
--- a/pelican/tests/output/custom_locale/categories.html
+++ b/pelican/tests/output/custom_locale/categories.html
@@ -80,4 +80,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/bar.html b/pelican/tests/output/custom_locale/category/bar.html
index d3dc29de4..644a611c6 100644
--- a/pelican/tests/output/custom_locale/category/bar.html
+++ b/pelican/tests/output/custom_locale/category/bar.html
@@ -93,4 +93,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/cat1.html b/pelican/tests/output/custom_locale/category/cat1.html
index 5278242cb..0fe473397 100644
--- a/pelican/tests/output/custom_locale/category/cat1.html
+++ b/pelican/tests/output/custom_locale/category/cat1.html
@@ -162,4 +162,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/misc.html b/pelican/tests/output/custom_locale/category/misc.html
index 82a77efb5..b300e98ff 100644
--- a/pelican/tests/output/custom_locale/category/misc.html
+++ b/pelican/tests/output/custom_locale/category/misc.html
@@ -173,4 +173,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/category/yeah.html b/pelican/tests/output/custom_locale/category/yeah.html
index f0dff1b6b..afa3c4dd2 100644
--- a/pelican/tests/output/custom_locale/category/yeah.html
+++ b/pelican/tests/output/custom_locale/category/yeah.html
@@ -101,4 +101,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
index 788f01a3f..114aac6cb 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article-without-date.html
@@ -96,4 +96,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/drafts/a-draft-article.html b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
index bd54bc561..406fbe360 100644
--- a/pelican/tests/output/custom_locale/drafts/a-draft-article.html
+++ b/pelican/tests/output/custom_locale/drafts/a-draft-article.html
@@ -96,4 +96,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
index d52de6f95..85b63173f 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
index 4d9f51658..f383a84da 100644
--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
@@ -26,4 +26,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
index 974c63b30..974b42799 100644
--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
@@ -71,4 +71,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
index cfd6eeb2e..f44b17f23 100644
--- a/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all-fr.atom.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom"><title>Alexis' log</title><link href="http://blog.notmyidea.org/" rel="alternate"></link><link href="http://blog.notmyidea.org/feeds/all-fr.atom.xml" rel="self"></link><id>http://blog.notmyidea.org/</id><updated>2012-02-29T00:00:00+01:00</updated><entry><title>Deuxième article</title><link href="http://blog.notmyidea.org/second-article-fr.html" rel="alternate"></link><published>2012-02-29T00:00:00+01:00</published><updated>2012-02-29T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2012-02-29:/second-article-fr.html</id><content type="html">&lt;p&gt;Ceci est un article, en français.&lt;/p&gt;
 </content><category term="misc"></category><category term="foo"></category><category term="bar"></category><category term="baz"></category></entry><entry><title>Trop bien !</title><link href="http://blog.notmyidea.org/oh-yeah-fr.html" rel="alternate"></link><published>2010-10-20T10:14:00+02:00</published><updated>2010-10-20T10:14:00+02:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-10-20:/oh-yeah-fr.html</id><content type="html">&lt;p&gt;Et voila du contenu en français&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
index e1063591a..c2a5ef38a 100644
--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
@@ -73,4 +73,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
index 442fc1ab9..9642bef9d 100644
--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
@@ -28,4 +28,4 @@ YEAH !&lt;/p&gt;
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.atom.xml b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
index d4467ea75..f3d8cc1e4 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.atom.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
\ No newline at end of file
+</content><category term="bar"></category><category term="oh"></category><category term="bar"></category><category term="yeah"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/bar.rss.xml b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
index d17d77032..71130b31b 100644
--- a/pelican/tests/output/custom_locale/feeds/bar.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/bar.rss.xml
@@ -5,4 +5,4 @@
 YEAH !&lt;/p&gt;
 &lt;img alt="alternate text" src="http://blog.notmyidea.org/pictures/Sushi.jpg" style="width: 600px; height: 450px;" /&gt;
 &lt;/div&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Oct 2010 10:14:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-20:/posts/2010/octobre/20/oh-yeah/</guid><category>bar</category><category>oh</category><category>bar</category><category>yeah</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
index 87a822e55..9a72b3989 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.atom.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</content><category term="cat1"></category></entry><entry><title>Article 1</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</id><content type="html">&lt;p&gt;Article 1&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 2</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</id><content type="html">&lt;p&gt;Article 2&lt;/p&gt;
 </content><category term="cat1"></category></entry><entry><title>Article 3</title><link href="http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/" rel="alternate"></link><published>2011-02-17T00:00:00+01:00</published><updated>2011-02-17T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</id><content type="html">&lt;p&gt;Article 3&lt;/p&gt;
-</content><category term="cat1"></category></entry></feed>
\ No newline at end of file
+</content><category term="cat1"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
index 6b328fda3..c16b80923 100644
--- a/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/cat1.rss.xml
@@ -4,4 +4,4 @@
 &lt;a href="http://blog.notmyidea.org/posts/2010/octobre/15/unbelievable/"&gt;a file-relative link to unbelievable&lt;/a&gt;&lt;/p&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Wed, 20 Apr 2011 00:00:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-04-20:/posts/2011/avril/20/a-markdown-powered-article/</guid><category>cat1</category></item><item><title>Article 1</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-1/</link><description>&lt;p&gt;Article 1&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-1/</guid><category>cat1</category></item><item><title>Article 2</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-2/</link><description>&lt;p&gt;Article 2&lt;/p&gt;
 </description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-2/</guid><category>cat1</category></item><item><title>Article 3</title><link>http://blog.notmyidea.org/posts/2011/f%C3%A9vrier/17/article-3/</link><description>&lt;p&gt;Article 3&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 17 Feb 2011 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2011-02-17:/posts/2011/février/17/article-3/</guid><category>cat1</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
index 2e46b4739..4898ab843 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
@@ -46,4 +46,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
 &lt;p&gt;Lovely.&lt;/p&gt;
 &lt;/div&gt;
 </content><category term="misc"></category></entry><entry><title>The baz tag</title><link href="http://blog.notmyidea.org/tag/baz.html" rel="alternate"></link><published>2010-03-14T00:00:00+01:00</published><updated>2010-03-14T00:00:00+01:00</updated><author><name>Alexis Métaireau</name></author><id>tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</id><content type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</content><category term="misc"></category></entry></feed>
\ No newline at end of file
+</content><category term="misc"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
index 01c241574..d1493ae89 100644
--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
@@ -13,4 +13,4 @@
 &lt;h2&gt;Testing another case&lt;/h2&gt;
 &lt;p&gt;This will now have a line number in 'custom' since it's the default in
 pelican.conf, it will …&lt;/p&gt;&lt;/div&gt;</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Fri, 15 Oct 2010 20:30:00 +0200</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-10-15:/posts/2010/octobre/15/unbelievable/</guid><category>misc</category></item><item><title>The baz tag</title><link>http://blog.notmyidea.org/tag/baz.html</link><description>&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Sun, 14 Mar 2010 00:00:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-03-14:/tag/baz.html</guid><category>misc</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
index 6f2e5f82a..f316ada56 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.atom.xml
@@ -13,4 +13,4 @@ as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
 &lt;/pre&gt;
 &lt;p&gt;→ And now try with some utf8 hell: ééé&lt;/p&gt;
 &lt;/div&gt;
-</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
\ No newline at end of file
+</content><category term="yeah"></category><category term="foo"></category><category term="bar"></category><category term="foobar"></category></entry></feed>
diff --git a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
index b7fb81f83..a0d0ba280 100644
--- a/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
+++ b/pelican/tests/output/custom_locale/feeds/yeah.rss.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"><channel><title>Alexis' log - yeah</title><link>http://blog.notmyidea.org/</link><description></description><lastBuildDate>Sun, 17 Nov 2013 23:29:00 +0100</lastBuildDate><item><title>This is a super article !</title><link>http://blog.notmyidea.org/posts/2010/d%C3%A9cembre/02/this-is-a-super-article/</link><description>&lt;p class="first last"&gt;Multi-line metadata should be supported
 as well as &lt;strong&gt;inline markup&lt;/strong&gt;.&lt;/p&gt;
-</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
\ No newline at end of file
+</description><dc:creator xmlns:dc="http://purl.org/dc/elements/1.1/">Alexis Métaireau</dc:creator><pubDate>Thu, 02 Dec 2010 10:14:00 +0100</pubDate><guid isPermaLink="false">tag:blog.notmyidea.org,2010-12-02:/posts/2010/décembre/02/this-is-a-super-article/</guid><category>yeah</category><category>foo</category><category>bar</category><category>foobar</category></item></channel></rss>
diff --git a/pelican/tests/output/custom_locale/index.html b/pelican/tests/output/custom_locale/index.html
index 054011cc4..37bfa0ace 100644
--- a/pelican/tests/output/custom_locale/index.html
+++ b/pelican/tests/output/custom_locale/index.html
@@ -171,4 +171,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index2.html b/pelican/tests/output/custom_locale/index2.html
index fa2c4d2dd..871fd5944 100644
--- a/pelican/tests/output/custom_locale/index2.html
+++ b/pelican/tests/output/custom_locale/index2.html
@@ -186,4 +186,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/index3.html b/pelican/tests/output/custom_locale/index3.html
index 71ccb4b1c..e3bbdffd0 100644
--- a/pelican/tests/output/custom_locale/index3.html
+++ b/pelican/tests/output/custom_locale/index3.html
@@ -136,4 +136,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/jinja2_template.html b/pelican/tests/output/custom_locale/jinja2_template.html
index 01957524f..c4bcf0194 100644
--- a/pelican/tests/output/custom_locale/jinja2_template.html
+++ b/pelican/tests/output/custom_locale/jinja2_template.html
@@ -72,4 +72,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/oh-yeah-fr.html b/pelican/tests/output/custom_locale/oh-yeah-fr.html
index 01c7800f1..02d301174 100644
--- a/pelican/tests/output/custom_locale/oh-yeah-fr.html
+++ b/pelican/tests/output/custom_locale/oh-yeah-fr.html
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/override/index.html b/pelican/tests/output/custom_locale/override/index.html
index a5fcbe045..e1212e43f 100644
--- a/pelican/tests/output/custom_locale/override/index.html
+++ b/pelican/tests/output/custom_locale/override/index.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Override url/save_as</h1>
-    
+
     <p>Test page which overrides save_as and url so that this page will be generated
 at a custom location.</p>
 
@@ -76,4 +76,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
index 3e33e3fce..5ba42b3f2 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-hidden-page.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test hidden page</h1>
-    
+
     <p>This is great for things like error(404) pages
 Anyone can see this page but it's not linked to anywhere!</p>
 
@@ -76,4 +76,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
index e4f1d60b6..83aaddb05 100644
--- a/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
+++ b/pelican/tests/output/custom_locale/pages/this-is-a-test-page.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">This is a test page</h1>
-    
+
     <p>Just an image.</p>
 <img alt="alternate text" src="../pictures/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
 <img alt="wrong path since 'images' folder does not exist" src="|filename|/images/Fat_Cat.jpg" style="width: 600px; height: 450px;" />
@@ -77,4 +77,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/pelican/tests/output/custom_locale/posts/2010/d\303\251cembre/02/this-is-a-super-article/index.html" "b/pelican/tests/output/custom_locale/posts/2010/d\303\251cembre/02/this-is-a-super-article/index.html"
index 4b5222489..338662217 100644
--- "a/pelican/tests/output/custom_locale/posts/2010/d\303\251cembre/02/this-is-a-super-article/index.html"
+++ "b/pelican/tests/output/custom_locale/posts/2010/d\303\251cembre/02/this-is-a-super-article/index.html"
@@ -125,4 +125,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
index f27464f80..ef9994c6d 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
@@ -142,4 +142,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
index b47732b71..07332310c 100644
--- a/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
+++ b/pelican/tests/output/custom_locale/posts/2010/octobre/20/oh-yeah/index.html
@@ -119,4 +119,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
index 80e57bc3b..5410e9d19 100644
--- a/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
+++ b/pelican/tests/output/custom_locale/posts/2011/avril/20/a-markdown-powered-article/index.html
@@ -111,4 +111,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-1/index.html" "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-1/index.html"
index c427e2c74..d4afa8b25 100644
--- "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-1/index.html"
+++ "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-1/index.html"
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-2/index.html" "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-2/index.html"
index 88c7adf2b..2d849548b 100644
--- "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-2/index.html"
+++ "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-2/index.html"
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-3/index.html" "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-3/index.html"
index 257fb6dd3..c6b03cc2a 100644
--- "a/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-3/index.html"
+++ "b/pelican/tests/output/custom_locale/posts/2011/f\303\251vrier/17/article-3/index.html"
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git "a/pelican/tests/output/custom_locale/posts/2012/f\303\251vrier/29/second-article/index.html" "b/pelican/tests/output/custom_locale/posts/2012/f\303\251vrier/29/second-article/index.html"
index 3b3bd10a0..a5a12bc98 100644
--- "a/pelican/tests/output/custom_locale/posts/2012/f\303\251vrier/29/second-article/index.html"
+++ "b/pelican/tests/output/custom_locale/posts/2012/f\303\251vrier/29/second-article/index.html"
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
index 2618f7053..848a04317 100644
--- a/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
+++ b/pelican/tests/output/custom_locale/posts/2012/novembre/30/filename_metadata-example/index.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/second-article-fr.html b/pelican/tests/output/custom_locale/second-article-fr.html
index 7edf7710d..51ee39777 100644
--- a/pelican/tests/output/custom_locale/second-article-fr.html
+++ b/pelican/tests/output/custom_locale/second-article-fr.html
@@ -114,4 +114,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/bar.html b/pelican/tests/output/custom_locale/tag/bar.html
index e0e0487f3..a4bda96fe 100644
--- a/pelican/tests/output/custom_locale/tag/bar.html
+++ b/pelican/tests/output/custom_locale/tag/bar.html
@@ -152,4 +152,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/baz.html b/pelican/tests/output/custom_locale/tag/baz.html
index 7fe3b54c2..a27bc92e8 100644
--- a/pelican/tests/output/custom_locale/tag/baz.html
+++ b/pelican/tests/output/custom_locale/tag/baz.html
@@ -110,4 +110,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foo.html b/pelican/tests/output/custom_locale/tag/foo.html
index a31e348bb..736fa5b8b 100644
--- a/pelican/tests/output/custom_locale/tag/foo.html
+++ b/pelican/tests/output/custom_locale/tag/foo.html
@@ -122,4 +122,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/foobar.html b/pelican/tests/output/custom_locale/tag/foobar.html
index a33f3362e..93757930c 100644
--- a/pelican/tests/output/custom_locale/tag/foobar.html
+++ b/pelican/tests/output/custom_locale/tag/foobar.html
@@ -101,4 +101,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/oh.html b/pelican/tests/output/custom_locale/tag/oh.html
index 5d021c7c1..1e583e7eb 100644
--- a/pelican/tests/output/custom_locale/tag/oh.html
+++ b/pelican/tests/output/custom_locale/tag/oh.html
@@ -28,7 +28,7 @@ <h1><a href="../">Alexis' log</a></h1>
         </header><!-- /#banner -->
 <section id="content" class="body">
     <h1 class="entry-title">Oh Oh Oh</h1>
-    
+
     <p>This page overrides the listening of the articles under the <em>oh</em> tag.</p>
 
 </section>
@@ -75,4 +75,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tag/yeah.html b/pelican/tests/output/custom_locale/tag/yeah.html
index 72b905f5b..219ab7e7a 100644
--- a/pelican/tests/output/custom_locale/tag/yeah.html
+++ b/pelican/tests/output/custom_locale/tag/yeah.html
@@ -93,4 +93,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/tags.html b/pelican/tests/output/custom_locale/tags.html
index 88b027240..3e59c960a 100644
--- a/pelican/tests/output/custom_locale/tags.html
+++ b/pelican/tests/output/custom_locale/tags.html
@@ -82,4 +82,4 @@ <h2>social</h2>
     }());
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/pelican/tests/output/custom_locale/theme/css/reset.css b/pelican/tests/output/custom_locale/theme/css/reset.css
index c88e6196c..f5123cf68 100644
--- a/pelican/tests/output/custom_locale/theme/css/reset.css
+++ b/pelican/tests/output/custom_locale/theme/css/reset.css
@@ -49,4 +49,4 @@ del {text-decoration: line-through;}
 table {
 	border-collapse: collapse;
 	border-spacing: 0;
-}
\ No newline at end of file
+}
diff --git a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
index 309fd710f..c70bcad3d 100644
--- a/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
+++ b/pelican/tests/output/custom_locale/theme/fonts/Yanone_Kaffeesatz_LICENSE.txt
@@ -18,7 +18,7 @@ with others.
 
 The OFL allows the licensed fonts to be used, studied, modified and
 redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
+fonts, including any derivative works, can be bundled, embedded,
 redistributed and/or sold with any software provided that any reserved
 names are not used by derivative works. The fonts and derivatives,
 however, cannot be released under any other type of license. The