Merge branch 'develop'

.gitignore

@@ -3,4 +3,8 @@
 .project
 doctrine-migrations.phar
 box.phar
-vendor
+/vendor/
+/config/app.config.php
+/config/services/echalegas.json
+/public/index.php
+/bin/phing

build.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="echalegas" description="Échale Gas (OpenData Puebla 2013)" default="app:reset-dev">   
+    <!-- Initialize configuration files -->
+    <target name="app:init-config-files" description="Initialize configuration files">
+        <echo msg="Creating configuration files from .dist files" />
+        <exec passthru="true" command="cp config/services/echalegas.json.dist config/services/echalegas.json" />
+        <exec passthru="true" command="cp config/app.config.php.dist config/app.config.php" />
+        <exec passthru="true" command="cp public/index.php.dist public/index.php" />
+    </target>
+
+    <!-- Install the application for development -->
+    <target name="app:reset-dev" description="Reset the development environment">
+        <echo msg="Resetting development environment" />
+        <phingcall target="app:init-config-files" />
+    </target>
+</project>

composer.json

@@ -38,14 +38,20 @@
 		"zendframework/zend-i18n": "2.2.3",
 		"zendframework/zend-session": "2.2.3",
 		"zendframework/zend-math": "2.2.3",
-		"slim/slim": "2.3.2",
+		"slim/slim": "2.3.3",
 		"slim/views": "0.1.0",
 		"monolog/monolog": "1.6.0",
 		"guzzle/guzzle": "v3.7.4"
     },
+    "require-dev": {
+        "phing/phing": "2.6.1"
+    },
     "autoload": {
         "psr-0": {
             "EchaleGas": "src"
         }
+    },
+    "config": {
+        "bin-dir": "bin"
     }
 }

config/app.config.php → config/app.config.php.dist

@@ -1,4 +1,5 @@
 <?php
 return [
 	'mode' => 'development',
+	'log.enabled' => false,
 ];