Merge branch 'master' into improve_readme

Conflicts:
	README.md

Author: agallou

composer.json

@@ -2,7 +2,7 @@
     "name": "atoum/config-extension",
     "type": "library",
     "description": "atoum extension to use Yaml configuration files",
-    "keywords": ["TDD","atoum","test","unit testing"],
+    "keywords": ["TDD", "atoum", "test", "unit testing", "config", "atoum-extension"],
     "homepage": "http://www.atoum.org",
     "license": "BSD",
     "authors": [