diff --git a/.gitignore b/.gitignore
index 99edd752..00d98c5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,8 @@ lexer/*.php
 lexer/*.php.bak
 lexer/*.out
 utilies/*.php
+
+# Dev
+phpunit*
+vendor/*
+composer.lock
diff --git a/composer.json b/composer.json
index 5007517b..75f36850 100644
--- a/composer.json
+++ b/composer.json
@@ -30,13 +30,16 @@
         "php": ">=5.2"
     },
     "autoload": {
-        "files": [
-            "libs/bootstrap.php"
+        "classmap": [
+            "libs/"
         ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1.x-dev"
         }
+    },
+    "require-dev": {
+        "smarty/smarty-dev": "~3.1@dev"
     }
-}
\ No newline at end of file
+}