2 files changed, 52 insertions, 47 deletions
diff --git a/.gitattributes b/.gitattributes
index 06374b854..d3aa9bed2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,7 +3,10 @@
 
 # Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
+*.bat text
+*.c text
 *.cfg text
+*.cmd text
 *.coffee text
 *.conf text
 *.htm text
@@ -19,16 +22,17 @@
 *.sh text
 *.thrift text
 *.txt text
-*.yaml text
 *.xml text
+*.yaml text
 
 # Denote all files that are truly binary and should not be modified.
-*.ico binary
 *.gif binary
+*.ico binary
 *.jpg binary
 *.mo binary
 *.pyc binary
+*.pyx binary
 *.png binary
-*.svg binary
 *.rar binary
+*.svg binary
 *.zip binary
diff --git a/.gitignore b/.gitignore
index b94b19812..061269bbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,52 @@
-# Packages
-bin/*
-build/*
-dist/*
-env/*
-lib/*
-lib64/*
-parts/*
-var/*
-sdist/*
+# Common packaging directories
+/bin/
+/build/
+/dist/
+/env/
+/lib/
+/lib64/
+/parts/
+/sdist/
+/var/
+/temp/
 
-# Common pyLoad directories
-Downloads/*
-Logs/*
-docs/_build/*
-docs/module/*
-docs/pyload/*
-#module/*
-pyload/*
+# Common directories
+.*/
+__pycache__/
+Downloads/
+Logs/
+tmp/
+userplugins/
+
+# Common files
+*.backup
+*.db
+*.pid
+/*.conf
+/*.version
+/*.txt
+/*.xml
+/*.zip
+/module/config/core.xml
+/module/config/plugin.xml
 
 # Common MacOS & Windows files
 *.DS_Store
 Thumbs.db
 desktop.ini
 
-# Temp stuff
-__pycache__
-.tmp
-temp
+# Certificate files
+cert.pem
+ssl.crt
+ssl.key
 
-# Installers stuff
+# Common compiled files
+*.mo
+*.so
+*.py[cod]
+!/pyload/plugins/container/DLC_*.py[cod]
+
+# Installer files
 .installed.cfg
 pip-log.txt
 
@@ -37,11 +55,7 @@ pip-log.txt
 .tox
 nosetests.xml
 
-# Compiled files
-*.so
-#*.py[cod]
-
-# EGG
+# Python Eggs
 *.egg
 *.egg-info
 develop-eggs
@@ -55,7 +69,7 @@ eggs
 # PyCharm
 .idea
 
-# Other development files
+# Other development stuff
 .svn
 *~
 *.orig
@@ -64,20 +78,7 @@ eggs
 *.project
 *.pydevproject
 *.rej
+/docs/_build/
+/pyload/
 DLC_*.py
 paver-minilib.zip
-
-# Certificates
-cert.pem
-ssl.crt
-ssl.key
-
-# Common pyLoad files
-*_links.txt
-links.txt
-module/config/core.xml
-module/config/plugin.xml
-module/web/pyload.db
-#pyload/config/core.xml
-#pyload/config/plugin.xml
-#pyload/web/pyload.db