Merge branch 'patch-unit'

.gitignore

@@ -1,3 +1,7 @@
 custom/config.yml
 custom/people.opml
 custom/people.opml.bak
+
+/vendor/
+composer.lock
+tests/_output/*

README.markdown

@@ -3,16 +3,15 @@ moonmoon
 
 [http://moonmoon.org/](http://moonmoon.org/)
 
-Moonmoon is a web based aggregator similar to planetplanet. 
+Moonmoon is a web based aggregator similar to planetplanet.
 It can be used to blend articles from different blogs with same interests into a single page.
 
-Moonmoon is stupidly simple: it only aggregates feeds and spits them out in one single page. 
+Moonmoon is stupidly simple: it only aggregates feeds and spits them out in one single page.
 It does not archive articles, it does not do comments nor votes.
 
 Requirements
 ------------
-Web hosting with PHP5.3 (PHP4 & 5.2 will not work).
-
+Web hosting with at least PHP5.4 (PHP4 & 5.2, 5.3 will not work).
 
 Installing
 ----------
@@ -45,4 +44,4 @@ categories:                     # only list posts that have one
                                 # of these (tag or category)
 ```
 
----
+---

app/app.php

@@ -8,8 +8,9 @@
     error_reporting(0);
 }
 
+require_once __DIR__.'/../vendor/autoload.php';
+
 include(dirname(__FILE__).'/lib/lib.opml.php');
-include(dirname(__FILE__).'/lib/simplepie/simplepie_1.3.compiled.php');
 include(dirname(__FILE__).'/lib/spyc-0.5/spyc.php');
 
 include_once(dirname(__FILE__).'/classes/PlanetConfig.php');
@@ -43,5 +44,3 @@
 function _g($str, $comment='') {
     return Simplel10n::getString($str);
 }
-
-