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 5064c8ce..c5dbe738 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "php": ">=5.2"
     },
     "autoload": {
-            "files": ["libs/bootstrap.php"]
+        "classmap": ["libs/"]
     },
     "extra": {
         "branch-alias": {