diff --git a/.gitattributes b/.gitattributes
index a46c8c196..f54186e54 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,8 @@
 .gitattributes export-ignore
 .gitignore export-ignore
-tools export-ignore
-tests export-ignore
-phpDoc export-ignore
+/tools/ export-ignore
+/tests/ export-ignore
+/phpDoc/ export-ignore
 Gruntfile.js export-ignore
-package.json export-ignore
\ No newline at end of file
+package.json export-ignore
+.travis.yml export-ignore
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 53e8f06dc..83b06d623 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-files/
-build/
-node_modules/
+config.user.inc.php
+/files/
+/build/
+/node_modules/
 .DS_Srore
-.Thumbs.db
\ No newline at end of file
+Thumbs.db