diff --git a/Actionscript.gitignore b/Actionscript.gitignore
index fa65f0bd..f112f7fb 100644
--- a/Actionscript.gitignore
+++ b/Actionscript.gitignore
@@ -8,4 +8,4 @@ bin-release/
 
 # Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
 # should NOT be excluded as they contain compiler settings and other important
-# information for Eclipse / Flash Builder.
\ No newline at end of file
+# information for Eclipse / Flash Builder.
diff --git a/Agda.gitignore b/Agda.gitignore
new file mode 100644
index 00000000..171a3897
--- /dev/null
+++ b/Agda.gitignore
@@ -0,0 +1 @@
+*.agdai
diff --git a/Android.gitignore b/Android.gitignore
index 87a44e0e..927ef517 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -12,19 +12,12 @@
 bin/
 gen/
 
+# Ignore gradle files
+.gradle/
+build/
+
 # Local configuration file (sdk path, etc)
 local.properties
 
-# Eclipse project files
-.classpath
-.project
-
 # Proguard folder generated by Eclipse
 proguard/
-
-# Intellij project files
-*.iml
-*.ipr
-*.iws
-.idea/
-
diff --git a/Autotools.gitignore b/Autotools.gitignore
index fc5e847d..053ff52f 100644
--- a/Autotools.gitignore
+++ b/Autotools.gitignore
@@ -11,3 +11,4 @@ Makefile.in
 /depcomp
 /install-sh
 /missing
+/stamp-h1
diff --git a/C++.gitignore b/C++.gitignore
index 620d3dc8..0def2755 100644
--- a/C++.gitignore
+++ b/C++.gitignore
@@ -2,12 +2,20 @@
 *.slo
 *.lo
 *.o
+*.obj
 
 # Compiled Dynamic libraries
 *.so
 *.dylib
+*.dll
 
 # Compiled Static libraries
 *.lai
 *.la
 *.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
diff --git a/C.gitignore b/C.gitignore
index 0331bbbd..6a2f800a 100644
--- a/C.gitignore
+++ b/C.gitignore
@@ -1,5 +1,8 @@
 # Object files
 *.o
+*.ko
+*.obj
+*.elf
 
 # Libraries
 *.lib
@@ -15,3 +18,4 @@
 *.exe
 *.out
 *.app
+*.hex
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..91543ab4
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,34 @@
+# Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
diff --git a/CakePHP.gitignore b/CakePHP.gitignore
index 61d34467..bd743c4d 100644
--- a/CakePHP.gitignore
+++ b/CakePHP.gitignore
@@ -4,4 +4,4 @@ tmp/*
 app/tmp/*
 app/[Cc]onfig/core.php
 app/[Cc]onfig/database.php
-!empty
\ No newline at end of file
+!empty
diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore
index e84c6417..ca0e37ee 100644
--- a/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@@ -3,3 +3,4 @@
 */logs/!index.html
 */cache/*
 */cache/!index.html
+*/cache/!.htaccess
\ No newline at end of file
diff --git a/Composer.gitignore b/Composer.gitignore
new file mode 100644
index 00000000..aa5997f4
--- /dev/null
+++ b/Composer.gitignore
@@ -0,0 +1,6 @@
+composer.phar
+vendor/
+
+# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# composer.lock
\ No newline at end of file
diff --git a/Concrete5.gitignore b/Concrete5.gitignore
index cfe1cabd..9aa215ad 100644
--- a/Concrete5.gitignore
+++ b/Concrete5.gitignore
@@ -1,3 +1,3 @@
 config/site.php
 files/cache/*
-files/tmp/*
\ No newline at end of file
+files/tmp/*
diff --git a/Coq.gitignore b/Coq.gitignore
index 769bc36c..d3083b3a 100644
--- a/Coq.gitignore
+++ b/Coq.gitignore
@@ -1,4 +1,3 @@
 *.vo
 *.glob
 *.v.d
-
diff --git a/Dart.gitignore b/Dart.gitignore
index 46f57628..db4229d4 100644
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,4 +1,16 @@
-.DS_Store
-packages
+// Don’t commit the following files and directories created by pub, Dart Editor, and dart2js
+packages/
 .project
-pubspec.lock
+.buildlog
+*.js_
+*.js.deps
+*.js.map
+
+// Include when developing application packages
+pubspec.lock 
+
+// Avoid committing generated JavaScript files
+*.dart.js
+
+// Check for any other incovenient files generated by OS 
+// and other tools such as Eclipse, IntelliJ, etc.
diff --git a/Delphi.gitignore b/Delphi.gitignore
index 38b6bd0c..7f331f15 100644
--- a/Delphi.gitignore
+++ b/Delphi.gitignore
@@ -1,5 +1,5 @@
 *.dcu
-*.~*~
+*.~*
 *.local
 *.identcache
 __history
@@ -7,4 +7,4 @@ __history
 *.map
 *.exe
 *.dll
-bin/*
\ No newline at end of file
+bin/*
diff --git a/Django.gitignore b/Django.gitignore
deleted file mode 100644
index d9437c31..00000000
--- a/Django.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.log
-*.pot
-*.pyc
-local_settings.py
diff --git a/Drupal.gitignore b/Drupal.gitignore
index 73677d29..a14c765d 100644
--- a/Drupal.gitignore
+++ b/Drupal.gitignore
@@ -8,7 +8,6 @@ sites/*/files
 sites/*/private
 
 # Ignore default text files
-.htaccess
 robots.txt
 /CHANGELOG.txt
 /COPYRIGHT.txt
@@ -22,6 +21,7 @@ sites/all/modules/README.txt
 sites/all/themes/README.txt
 
 # Ignore everything but the "sites" folder ( for non core developer )
+.htaccess
 web.config
 authorize.php
 cron.php
@@ -34,4 +34,4 @@ xmlrpc.php
 /modules
 /profiles
 /scripts
-/themes
\ No newline at end of file
+/themes
diff --git a/EPiServer.gitignore b/EPiServer.gitignore
new file mode 100644
index 00000000..ca7a7862
--- /dev/null
+++ b/EPiServer.gitignore
@@ -0,0 +1,4 @@
+######################
+## EPiServer Files
+######################
+*License.config
\ No newline at end of file
diff --git a/ExpressionEngine.gitignore b/ExpressionEngine.gitignore
index c56e7abc..314e4df1 100644
--- a/ExpressionEngine.gitignore
+++ b/ExpressionEngine.gitignore
@@ -8,8 +8,12 @@ images/member_photos/
 images/signature_attachments/
 images/pm_attachments/
 
+# For security do not publish the following files
+system/expressionengine/config/database.php
+system/expressionengine/config/config.php
+
 # Caches
 sized/
 thumbs/
 _thumbs/
-*/expressionengine/cache/*
\ No newline at end of file
+*/expressionengine/cache/*
diff --git a/Fancy.gitignore b/Fancy.gitignore
new file mode 100644
index 00000000..6b345074
--- /dev/null
+++ b/Fancy.gitignore
@@ -0,0 +1,2 @@
+*.rbc
+*.fyc
\ No newline at end of file
diff --git a/Finale.gitignore b/Finale.gitignore
index c8ac293b..7ef08e0c 100644
--- a/Finale.gitignore
+++ b/Finale.gitignore
@@ -11,4 +11,3 @@
 # Some versions of Finale have a bug and randomly save extra copies of
 # the music source as "<Filename> copy.mus"
 *copy.mus
-
diff --git a/ForceDotCom.gitignore b/ForceDotCom.gitignore
index ee95ec3d..3933cd4d 100644
--- a/ForceDotCom.gitignore
+++ b/ForceDotCom.gitignore
@@ -1,4 +1,4 @@
 .project
 .settings
 salesforce.schema
-Referenced Packages
\ No newline at end of file
+Referenced Packages
diff --git a/GWT.gitignore b/GWT.gitignore
index 63e3e9c5..c558713f 100644
--- a/GWT.gitignore
+++ b/GWT.gitignore
@@ -14,4 +14,3 @@ gwt-unitCache/
 # more caches and things from deploy #
 war/WEB-INF/deploy/
 war/WEB-INF/classes/
-
diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore
index 82d3b10f..e9eda68b 100644
--- a/Global/Archives.gitignore
+++ b/Global/Archives.gitignore
@@ -9,6 +9,7 @@
 *.bz2
 *.xz
 *.lzma
+*.cab
 
 #packing-only formats
 *.iso
@@ -21,3 +22,6 @@
 *.egg
 *.deb
 *.rpm
+*.msi
+*.msm
+*.msp
diff --git a/Global/BricxCC.gitignore b/Global/BricxCC.gitignore
new file mode 100644
index 00000000..c1d16a46
--- /dev/null
+++ b/Global/BricxCC.gitignore
@@ -0,0 +1,4 @@
+# Bricx Command Center IDE
+# http://bricxcc.sourceforge.net
+*.bak
+*.sym
diff --git a/Global/CVS.gitignore b/Global/CVS.gitignore
index 0f0f06ed..01ba8634 100644
--- a/Global/CVS.gitignore
+++ b/Global/CVS.gitignore
@@ -1,4 +1,4 @@
 /CVS/*
 */CVS/*
 .cvsignore
-*/.cvsignore
\ No newline at end of file
+*/.cvsignore
diff --git a/Global/Cloud9.gitignore b/Global/Cloud9.gitignore
new file mode 100644
index 00000000..b9f8a369
--- /dev/null
+++ b/Global/Cloud9.gitignore
@@ -0,0 +1,2 @@
+# Cloud9 IDE - http://c9.io
+.c9revisions
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 7b3ad03c..73468714 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -1,6 +1,6 @@
 *.pydevproject
-.project
 .metadata
+.gradle
 bin/**
 tmp/**
 tmp/**/*
@@ -9,7 +9,6 @@ tmp/**/*
 *.swp
 *~.nib
 local.properties
-.classpath
 .settings/
 .loadpath
 
@@ -24,3 +23,6 @@ local.properties
 
 # PDT-specific
 .buildpath
+
+# TeXlipse plugin
+.texlipse
diff --git a/Global/Emacs.gitignore b/Global/Emacs.gitignore
index 8c996106..ee3b865e 100644
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -1,8 +1,9 @@
+# -*- mode: gitignore; -*-
 *~
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
-.elc
+*.elc
 auto-save-list
 tramp
 .\#*
@@ -10,3 +11,6 @@ tramp
 # Org-mode
 .org-id-locations
 *_archive
+
+# flymake-mode
+*_flymake.*
diff --git a/Global/Ensime.gitignore b/Global/Ensime.gitignore
new file mode 100644
index 00000000..6d8c2b09
--- /dev/null
+++ b/Global/Ensime.gitignore
@@ -0,0 +1,3 @@
+# Ensime specific
+.ensime
+.ensime_lucene/
\ No newline at end of file
diff --git a/Global/Espresso.gitignore b/Global/Espresso.gitignore
index 1aaec9c4..1234530b 100644
--- a/Global/Espresso.gitignore
+++ b/Global/Espresso.gitignore
@@ -1 +1 @@
-*.esproj
\ No newline at end of file
+*.esproj
diff --git a/Global/FlexBuilder.gitignore b/Global/FlexBuilder.gitignore
index 86543949..b6ce3f1e 100644
--- a/Global/FlexBuilder.gitignore
+++ b/Global/FlexBuilder.gitignore
@@ -1,2 +1,2 @@
 bin/
-bin-debug/
\ No newline at end of file
+bin-debug/
diff --git a/Global/IntelliJ.gitignore b/Global/IntelliJ.gitignore
deleted file mode 100644
index 7d89b9c0..00000000
--- a/Global/IntelliJ.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.iml
-*.ipr
-*.iws
-.idea/
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
new file mode 100644
index 00000000..5db4d2e7
--- /dev/null
+++ b/Global/JetBrains.gitignore
@@ -0,0 +1,23 @@
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode
+
+## Directory-based project format
+.idea/
+# if you remove the above rule, at least ignore user-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# and these sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+
+## File-based project format
+*.ipr
+*.iws
+*.iml
+
+## Additional for IntelliJ
+out/
+
+# generated by mpeltonen/sbt-idea plugin
+.idea_modules/
diff --git a/Global/KDevelop4.gitignore b/Global/KDevelop4.gitignore
new file mode 100644
index 00000000..7ac57b1a
--- /dev/null
+++ b/Global/KDevelop4.gitignore
@@ -0,0 +1,2 @@
+*.kdev4
+.kdev4/
diff --git a/Global/Kate.gitignore b/Global/Kate.gitignore
new file mode 100644
index 00000000..7ff06ce5
--- /dev/null
+++ b/Global/Kate.gitignore
@@ -0,0 +1,3 @@
+# Swap Files #
+.*.kate-swp
+.swp.*
diff --git a/Global/Linux.gitignore b/Global/Linux.gitignore
index 151e2997..b25c15b8 100644
--- a/Global/Linux.gitignore
+++ b/Global/Linux.gitignore
@@ -1,3 +1 @@
-.*
-!.gitignore
 *~
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
index f52813b6..79bc56cd 100644
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -12,5 +12,5 @@
 # Compiled MEX binaries (all platforms)
 *.mex*
 
-# Simulink Code Generation	
+# Simulink Code Generation
 slprj/
diff --git a/Global/NotepadPP.gitignore b/Global/NotepadPP.gitignore
new file mode 100644
index 00000000..9ec9df15
--- /dev/null
+++ b/Global/NotepadPP.gitignore
@@ -0,0 +1,2 @@
+# Notepad++ backups #
+*.bak
\ No newline at end of file
diff --git a/Global/OSX.gitignore b/Global/OSX.gitignore
index cf8db5d9..65b94232 100644
--- a/Global/OSX.gitignore
+++ b/Global/OSX.gitignore
@@ -1,8 +1,9 @@
 .DS_Store
 .AppleDouble
 .LSOverride
-Icon
 
+# Icon must ends with two \r.
+Icon

 
 # Thumbnails
 ._*
diff --git a/Global/PhPStorm.gitignore b/Global/PhPStorm.gitignore
deleted file mode 100644
index 62c89355..00000000
--- a/Global/PhPStorm.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea/
\ No newline at end of file
diff --git a/Global/PyCharm.gitignore b/Global/PyCharm.gitignore
deleted file mode 100644
index 57272810..00000000
--- a/Global/PyCharm.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# PyCharm
-# http://www.jetbrains.com/pycharm/webhelp/project.html
-.idea
-.iml
diff --git a/Global/RubyMine.gitignore b/Global/RubyMine.gitignore
deleted file mode 100644
index 1cc4572e..00000000
--- a/Global/RubyMine.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea/workspace.xml
diff --git a/Global/SASS.gitignore b/Global/SASS.gitignore
index 2c306072..c1df001e 100644
--- a/Global/SASS.gitignore
+++ b/Global/SASS.gitignore
@@ -1,2 +1,2 @@
-### SASS Ignores - "Sassy CSS" http://sass-lang.com/
+### Sass Ignores - "Sassy CSS" http://sass-lang.com/
 *.sass-cache
diff --git a/Global/SBT.gitignore b/Global/SBT.gitignore
index 3dfc9d7c..1f4d73bc 100644
--- a/Global/SBT.gitignore
+++ b/Global/SBT.gitignore
@@ -4,4 +4,6 @@
 target/
 lib_managed/
 src_managed/
-project/boot/
\ No newline at end of file
+project/boot/
+.history
+.cache
diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore
index aea37e0a..e5bfb723 100644
--- a/Global/SublimeText.gitignore
+++ b/Global/SublimeText.gitignore
@@ -1,2 +1,6 @@
-# SublimeText project files
+# workspace files are user-specific
 *.sublime-workspace
+
+# project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using SublimeText
+# *.sublime-project
diff --git a/Global/Tags.gitignore b/Global/Tags.gitignore
index cc28fefa..45922ec1 100644
--- a/Global/Tags.gitignore
+++ b/Global/Tags.gitignore
@@ -1,5 +1,14 @@
-# Ignore tags created by etags and ctags
+# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
 !TAGS/
 tags
 !tags/
+gtags.files
+GTAGS
+GRTAGS
+GPATH
+cscope.files
+cscope.out
+cscope.in.out
+cscope.po.out
+
diff --git a/Global/Vagrant.gitignore b/Global/Vagrant.gitignore
new file mode 100644
index 00000000..a977916f
--- /dev/null
+++ b/Global/Vagrant.gitignore
@@ -0,0 +1 @@
+.vagrant/
diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore
index 351ec9d1..41968b07 100644
--- a/Global/Windows.gitignore
+++ b/Global/Windows.gitignore
@@ -7,3 +7,9 @@ Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
diff --git a/Global/vim.gitignore b/Global/vim.gitignore
index 51514eb2..6c5ee8df 100644
--- a/Global/vim.gitignore
+++ b/Global/vim.gitignore
@@ -1,4 +1,5 @@
-.*.s[a-w][a-z]
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
 *.un~
 Session.vim
 .netrwhist
diff --git a/Go.gitignore b/Go.gitignore
index 00268614..83656241 100644
--- a/Go.gitignore
+++ b/Go.gitignore
@@ -20,3 +20,4 @@ _cgo_export.*
 _testmain.go
 
 *.exe
+*.test
diff --git a/Grails.gitignore b/Grails.gitignore
index 96f72ec8..4c0c15b8 100644
--- a/Grails.gitignore
+++ b/Grails.gitignore
@@ -34,11 +34,9 @@
 # older plugin install locations
 /plugins
 /web-app/plugins
-/web-app/WEB-INF/classes
 
 # "temporary" build files
 /target
 
 # other
 *.iws
-
diff --git a/Haskell.gitignore b/Haskell.gitignore
index 477a3533..cc143076 100644
--- a/Haskell.gitignore
+++ b/Haskell.gitignore
@@ -5,3 +5,7 @@ cabal-dev
 *.chi
 *.chs.h
 .virthualenv
+.hsenv
+.cabal-sandbox/
+cabal.sandbox.config
+cabal.config
diff --git a/Jboss.gitignore b/Jboss.gitignore
index 5d7167f5..75d1731e 100644
--- a/Jboss.gitignore
+++ b/Jboss.gitignore
@@ -13,3 +13,7 @@ jboss/server/minimal/log/*.log
 jboss/server/minimal/tmp/**/*
 jboss/server/minimal/data/**/*
 jboss/server/minimal/work/**/*
+
+# deployed package files #
+
+*.DEPLOYED
diff --git a/Joomla.gitignore b/Joomla.gitignore
index bcd6feb9..54825f4e 100644
--- a/Joomla.gitignore
+++ b/Joomla.gitignore
@@ -393,4 +393,4 @@ tmp/*
 configuration.php
 index.php
 joomla.xml
-*.txt
\ No newline at end of file
+*.txt
diff --git a/Kohana.gitignore b/Kohana.gitignore
index 42d7030f..8b2ab01a 100644
--- a/Kohana.gitignore
+++ b/Kohana.gitignore
@@ -1,2 +1,2 @@
 application/cache/*
-application/logs/*
\ No newline at end of file
+application/logs/*
diff --git a/LICENSE b/LICENSE
index 0f05796d..f247e598 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2012 GitHub, Inc.
+Copyright (c) 2013 GitHub, Inc.
 
 Permission is hereby granted,  free of charge,  to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/LaTeX.gitignore b/LaTeX.gitignore
deleted file mode 100644
index bbaaa01b..00000000
--- a/LaTeX.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-*.acn
-*.acr
-*.alg
-*.aux
-*.bbl
-*.blg
-*.dvi
-*.fdb_latexmk
-*.glg
-*.glo
-*.gls
-*.idx
-*.ilg
-*.ind
-*.ist
-*.lof
-*.log
-*.lot
-*.maf
-*.mtc
-*.mtc0
-*.nav
-*.nlo
-*.out
-*.pdfsync
-*.ps
-*.snm
-*.synctex.gz
-*.toc
-*.vrb
-*.xdy
-*.tdo
diff --git a/Leiningen.gitignore b/Leiningen.gitignore
index 40fbb289..b8d32453 100644
--- a/Leiningen.gitignore
+++ b/Leiningen.gitignore
@@ -2,5 +2,7 @@ pom.xml
 *jar
 /lib/
 /classes/
-/targets/
+/target/
 .lein-deps-sum
+.lein-repl-history
+.lein-plugins/
diff --git a/LemonStand.gitignore b/LemonStand.gitignore
index bc59f9c7..c7d94ad3 100644
--- a/LemonStand.gitignore
+++ b/LemonStand.gitignore
@@ -18,4 +18,4 @@ install.php
 /modules/shop/*
 /modules/system/*
 /modules/users/*
-# add content_*.php if you don't want erase client changes to content
\ No newline at end of file
+# add content_*.php if you don't want erase client changes to content
diff --git a/Magento.gitignore b/Magento.gitignore
index 52e8bb25..7eac4663 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -15,14 +15,18 @@ app/etc/modules/Enterprise_*
 app/etc/modules/Find_Feed.xml
 app/etc/modules/Mage_All.xml
 app/etc/modules/Mage_Api.xml
+app/etc/modules/Mage_Api2.xml
 app/etc/modules/Mage_Authorizenet.xml
 app/etc/modules/Mage_Bundle.xml
+app/etc/modules/Mage_Captcha.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Compiler.xml
 app/etc/modules/Mage_Connect.xml
+app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
 app/etc/modules/Mage_ImportExport.xml
 app/etc/modules/Mage_LoadTest.xml
+app/etc/modules/Mage_Oauth.xml
 app/etc/modules/Mage_PageCache.xml
 app/etc/modules/Mage_Persistent.xml
 app/etc/modules/Mage_Weee.xml
@@ -33,6 +37,7 @@ app/etc/config.xml
 app/etc/enterprise.xml
 app/etc/local.xml.additional
 app/etc/local.xml.template
+app/etc/local.xml
 app/.htaccess
 app/locale/
 app/Mage.php
@@ -45,7 +50,7 @@ get.php
 includes/
 index.php
 index.php.sample
-install.php
+/install.php
 js/blank.html
 js/calendar/
 js/enterprise/
@@ -78,10 +83,13 @@ LICENSE.txt
 LICENSE_EE*
 mage
 media/customer/
+media/dhl/
 media/downloadable/
 media/.htaccess
 media/import/
 media/xmlconnect/
+media/catalog/product/cache/
+
 nbproject/
 pear
 pear/
diff --git a/Maven.gitignore b/Maven.gitignore
index 2f7896d1..6ca4036f 100644
--- a/Maven.gitignore
+++ b/Maven.gitignore
@@ -1 +1,2 @@
 target/
+ *.releaseBackup
diff --git a/Meteor.gitignore b/Meteor.gitignore
new file mode 100644
index 00000000..6a6ea0e5
--- /dev/null
+++ b/Meteor.gitignore
@@ -0,0 +1,2 @@
+.meteor/local
+.meteor/meteorite
\ No newline at end of file
diff --git a/Node.gitignore b/Node.gitignore
index 4d063b5c..cfdef680 100644
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -11,5 +11,4 @@ pids
 logs
 results
 
-npm-debug.log
-node_modules
\ No newline at end of file
+node_modules
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 31e6fd9a..af228cde 100644
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -1,6 +1,8 @@
-# Xcode
+# OS X
 .DS_Store
-*/build/*
+
+# Xcode
+build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -10,8 +12,12 @@
 *.perspectivev3
 !default.perspectivev3
 xcuserdata
+*.xccheckout
 profile
 *.moved-aside
 DerivedData
-.idea/
 *.hmap
+*.xccheckout
+
+# CocoaPods
+Pods
diff --git a/Perl.gitignore b/Perl.gitignore
index c15b52a9..eaca02ed 100644
--- a/Perl.gitignore
+++ b/Perl.gitignore
@@ -1,5 +1,5 @@
-blib/
-.build/
+/blib/
+/.build/
 _build/
 cover_db/
 inc/
@@ -7,10 +7,13 @@ Build
 !Build/
 Build.bat
 .last_cover_stats
-Makefile
-Makefile.old
-MANIFEST.bak
-META.yml
-MYMETA.yml
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/META.yml
+/META.json
+/MYMETA.*
 nytprof.out
-pm_to_blib
+/pm_to_blib
+*.o
+*.bs
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
index 663eb677..ed27485a 100644
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -1,10 +1,5 @@
-# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
-# Ignore all dotfiles...
-.*
-# except for .gitignore
-!.gitignore
-
 # Ignore Play! working directory #
+bin
 db
 eclipse
 lib
diff --git a/Plone.gitignore b/Plone.gitignore
index 13edefa5..770a8681 100644
--- a/Plone.gitignore
+++ b/Plone.gitignore
@@ -1,4 +1,3 @@
-*~
 *.pyc
 *.pyo
 *.tmp*
@@ -7,17 +6,7 @@
 *.EGG
 *.egg-info
 *.EGG-INFO
-*.kpf
-*.swp
-*.wpr
 .*.cfg
-.installed.cfg
-.mr.developer.cfg
-.hg/
-.bzr/
-.svn/
-.project
-.pydevproject
 bin/
 build/
 develop-eggs/
@@ -27,8 +16,3 @@ fake-eggs/
 parts/
 dist/
 var/
-
-
-
-# OSX
-.DS_Store
diff --git a/Prestashop.gitignore b/Prestashop.gitignore
new file mode 100644
index 00000000..e957df94
--- /dev/null
+++ b/Prestashop.gitignore
@@ -0,0 +1,29 @@
+# Directories content
+cache/class_index.php
+cache/smarty/cache/*
+!cache/smarty/cache/index.php
+cache/smarty/compile/*
+!cache/smarty/compile/index.php
+cache/tcpdf/*
+!cache/tcpdf/index.php
+
+config/xml/*.xml
+config/settings.inc.php
+
+log/*.log
+
+img/*
+!img/index.php
+!img/*/index.php
+
+tools/smarty*/cache/*.php
+!tools/smarty*/cache/index.php
+tools/smarty*/compile/*.php
+!tools/smarty*/compile/index.php
+
+themes/default/cache/*.js
+themes/default/cache/*.css
+
+# Ignore files on root directory
+robots.txt
+sitemap.xml
\ No newline at end of file
diff --git a/Processing.gitignore b/Processing.gitignore
new file mode 100644
index 00000000..85f269a8
--- /dev/null
+++ b/Processing.gitignore
@@ -0,0 +1,7 @@
+.DS_Store
+applet
+application.linux32
+application.linux64
+application.windows32
+application.windows64
+application.macosx
diff --git a/Python.gitignore b/Python.gitignore
index ded60678..3d578453 100644
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -1,31 +1,35 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
 *.py[cod]
 
 # C extensions
 *.so
 
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
+# Distribution / packaging
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
 .installed.cfg
-lib
-lib64
-__pycache__
+*.egg
 
 # Installer logs
 pip-log.txt
+pip-delete-this-directory.txt
 
 # Unit test / coverage reports
+.tox/
 .coverage
-.tox
+.cache
 nosetests.xml
+coverage.xml
 
 # Translations
 *.mo
@@ -34,3 +38,11 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# Django stuff:
+*.log
+*.pot
+
+# Sphinx documentation
+docs/_build/
+
diff --git a/Qt.gitignore b/Qt.gitignore
index 16b4ee58..29d98c9e 100644
--- a/Qt.gitignore
+++ b/Qt.gitignore
@@ -16,5 +16,10 @@
 *.pro.user.*
 moc_*.cpp
 qrc_*.cpp
-Makefile
+ui_*.h
+Makefile*
 *-build-*
+
+# QtCreator
+
+*.autosave
diff --git a/R.gitignore b/R.gitignore
index 42effd3f..a0fd3b34 100644
--- a/R.gitignore
+++ b/R.gitignore
@@ -2,4 +2,4 @@
 .Rhistory
 
 # Example code in package build process
-*-Ex.R
\ No newline at end of file
+*-Ex.R
diff --git a/README.md b/README.md
index 66c163ad..14042e94 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,79 @@
-# A Collection of Useful .gitignore Templates
+# A collection of `.gitignore` templates
 
-That's what we're trying to build. Please contribute
-by [forking][fk] and sending a [pull request][pr].
+This is GitHub’s collection of [`.gitignore`][man] file templates.
+We use this list to populate the `.gitignore` template choosers available
+in the GitHub.com interface when creating new repositories and files.
 
-Also **please** only modify **one file** per commit. This'll
-make merging easier for everyone.
+For more information about how `.gitignore` files work, and how to use them,
+the following resources are a great place to start:
 
-Global gitignores (OS-specific, editor-specific) should go into the
-`Global/` directory.
+- The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
+- The [Ignoring Files article][help] on the GitHub Help site.
+- The [gitignore(5)][man] manual page.
 
-For more information on gitignore: [gitignore(5)][g5]
+[man]: http://git-scm.com/docs/gitignore
+[help]: https://help.github.com/articles/ignoring-files
+[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
+[progit]: http://git-scm.com/book
 
-[fk]: http://help.github.com/forking/
+## Folder structure
+
+The files in the root directory are for `.gitignore` templates that are
+project specific, such as language or framework specific templates.
+Global (operating system or editor specific) templates should go into the
+[`Global/`](./Global) directory.
+
+## Contributing guidelines
+
+We’d love you to help us improve this project. To help us keep this collection
+high quality, we request that contributions adhere to the following guidelines.
+
+- **Provide a link to the application or project’s homepage**. Unless it’s
+  extremely popular, there’s a chance the maintainers don’t know about or use
+  the language, framework, editor, app, or project your change applies to.
+  
+- **Provide links to documentation** supporting the change you’re making.
+  Current, canonical documentation mentioning the files being ignored is best.
+  If documentation isn’t available to support your change, do the best you can
+  to explain what the files being ignored are for.
+  
+- **Explain why you’re making a change**. Even if it seems self-evident, please
+  take a sentence or two to tell us why your change or addition should happen.
+  It’s especially helpful to articulate why this change applies to *everyone*
+  who works with the applicable technology, rather than just you or your team.
+  
+- **Please consider the scope of your change**. If your change specific to a
+  certain language or framework, then make sure the change is made to the
+  template for that language or framework, rather than to the template for an
+  editor, tool, or operating system.
+
+- **Please only modify *one template* per pull request**. This helps keep pull
+  requests and feedback focused on a specific project or technology.
+
+In general, the more you can do to help us understand the change you’re making,
+the more likely we’ll be to accept your contribution quickly.
+
+Please also understand that we can’t list every tool that ever existed.
+Our aim is to curate a collection of the *most common and helpful* templates,
+not to make sure we cover every project possible. If we choose not to
+include your language, tool, or project, it’s not because it’s not awesome.
+
+## Contributing workflow
+
+Here’s how we suggest you go about proposing a change to this project:
+
+1. [Fork this project][fork] to your account.
+2. [Create a branch][branch] for the change you intend to make.
+3. Make your changes to your fork.
+4. [Send a pull request][pr] from your fork’s branch to our `master` branch.
+
+Using the web-based interface to make changes is fine too, and will help you
+by automatically forking the project and prompting to send a pull request too.
+
+[fork]: http://help.github.com/forking/
+[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
 [pr]: http://help.github.com/pull-requests/
-[g5]: http://man.cx/gitignore
 
-## Pull Requests
+## License
 
-Since this repo includes a large and diverse
-number of programming languages, frameworks, editors,
-and ecosystems, it's **very helpful** if you can provide 
-a link to information supporting your pull request. 
-Up-to-date, canonical documentation that mentions the files 
-to be ignored is best.
-
-This ensures we can efficiently go through pull requests
-and keep quality high.
-
-## Global Ignores
-
-git has a global configuration that applies rules to all of
-your projects. For example:
-
-    git config --global core.excludesfile ~/.global_ignore
-
-... will apply the rules in ~/.global_ignore for all of your repos.
-
-This is useful if you use an editor (like Emacs) that drops backup files,
-or if you work in an environment that generates binary or intermediate
-files that are always ignored.
+[MIT](./LICENSE).
diff --git a/Rails.gitignore b/Rails.gitignore
index bf692e15..b4be5c7b 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -3,16 +3,23 @@
 .sass-cache
 capybara-*.html
 .rspec
-.rvmrc
-/.bundle
-/vendor/bundle
-/log/*
-/tmp/*
+/log
+/tmp
 /db/*.sqlite3
-/public/system/*
+/public/system
 /coverage/
-/spec/tmp/*
+/spec/tmp
 **.orig
 rerun.txt
 pickle-email-*.html
-.project
+config/initializers/secret_token.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/Ruby.gitignore b/Ruby.gitignore
index 560d1a6a..99e72c12 100644
--- a/Ruby.gitignore
+++ b/Ruby.gitignore
@@ -1,18 +1,29 @@
 *.gem
 *.rbc
-.bundle
-.config
-coverage
-InstalledFiles
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/test/tmp/
+/test/version_tmp/
+/tmp/
 
-# YARD artifacts
-.yardoc
-_yardoc
-doc/
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalisation:
+/.bundle/
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+# Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
diff --git a/RubyMotion.gitignore b/RubyMotion.gitignore
new file mode 100644
index 00000000..7e395179
--- /dev/null
+++ b/RubyMotion.gitignore
@@ -0,0 +1,20 @@
+.dat*
+.repl_history
+build/
+tags
+
+# Editor files
+.DS_Store
+nbproject
+.redcar
+*.swp
+*.swo
+~
+.eprj
+vendor/Pods
+*.nib
+
+# YARD artifacts
+.yardoc
+_yardoc
+doc/
diff --git a/Scala.gitignore b/Scala.gitignore
index f5b7d72a..28adf319 100644
--- a/Scala.gitignore
+++ b/Scala.gitignore
@@ -2,6 +2,9 @@
 *.log
 
 # sbt specific
+.cache/
+.history/
+.lib/
 dist/*
 target/
 lib_managed/
@@ -10,4 +13,4 @@ project/boot/
 project/plugins/project/
 
 # Scala-IDE specific
-.scala_dependencies
\ No newline at end of file
+.scala_dependencies
diff --git a/Sdcc.gitignore b/Sdcc.gitignore
index a4cb9fcd..07ee7d59 100644
--- a/Sdcc.gitignore
+++ b/Sdcc.gitignore
@@ -6,4 +6,3 @@
 *.rel
 *.rst
 *.sym
-
diff --git a/Symfony.gitignore b/Symfony.gitignore
index ac10ca80..e5d08cbe 100644
--- a/Symfony.gitignore
+++ b/Symfony.gitignore
@@ -12,4 +12,4 @@ lib/model/doctrine/base/Base*
 lib/model/doctrine/*Plugin/base/Base*
 lib/model/om/*
 lib/model/map/*
-web/*Plugin/*
\ No newline at end of file
+web/*Plugin/*
diff --git a/Symfony2.gitignore b/Symfony2.gitignore
index 0b2956f9..f4a95cb4 100644
--- a/Symfony2.gitignore
+++ b/Symfony2.gitignore
@@ -11,3 +11,6 @@ web/bundles/*
 # Configuration files
 app/config/parameters.ini
 app/config/parameters.yml
+
+# Composer
+composer.phar
\ No newline at end of file
diff --git a/TeX.gitignore b/TeX.gitignore
new file mode 100644
index 00000000..b0a911e0
--- /dev/null
+++ b/TeX.gitignore
@@ -0,0 +1,78 @@
+## Core latex/pdflatex auxiliary files:
+*.aux
+*.lof
+*.log
+*.lot
+*.fls
+*.out
+*.toc
+
+## Intermediate documents:
+*.dvi
+# these rules might exclude image files for figures etc.
+# *.ps
+# *.eps
+# *.pdf
+
+## Bibliography auxiliary files (bibtex/biblatex/biber):
+*.bbl
+*.bcf
+*.blg
+*-blx.aux
+*-blx.bib
+*.run.xml
+
+## Build tool auxiliary files:
+*.fdb_latexmk
+*.synctex.gz
+*.pdfsync
+
+## Auxiliary and intermediate files from other packages:
+
+# algorithms
+*.alg
+*.loa
+
+# amsthm
+*.thm
+
+# beamer
+*.nav
+*.snm
+*.vrb
+
+# glossaries
+*.acn
+*.acr
+*.glg
+*.glo
+*.gls
+
+# hyperref
+*.brf
+
+# listings
+*.lol
+
+# makeidx
+*.idx
+*.ilg
+*.ind
+*.ist
+
+# minitoc
+*.maf
+*.mtc
+*.mtc0
+
+# minted
+*.pyg
+
+# nomencl
+*.nlo
+
+# todonotes
+*.tdo
+
+# xindy
+*.xdy
diff --git a/Typo3.gitignore b/Typo3.gitignore
index 0ee23cbf..d1593b16 100644
--- a/Typo3.gitignore
+++ b/Typo3.gitignore
@@ -1,4 +1,4 @@
-## Typo3
+## TYPO3 v4
 # Ignore serveral upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/_temp_/
@@ -12,7 +12,7 @@
 /typo3conf/localconf_local.php
 # Ignore system folders, you should have them symlinked.
 # If not comment out the following two entries.
-/typo3/
-/t3lib/
+/typo3
+/t3lib
 # Ignore temp directory.
 /typo3temp/
diff --git a/Unity.gitignore b/Unity.gitignore
index 6425e291..682085a5 100644
--- a/Unity.gitignore
+++ b/Unity.gitignore
@@ -3,6 +3,8 @@
 [Oo]bj/
 
 # Autogenerated VS/MD solution and project files
-*.csproj
-*.unityproj
-*.sln
+/*.csproj
+/*.unityproj
+/*.sln
+/*.suo
+/*.user
diff --git a/VVVV.gitignore b/VVVV.gitignore
new file mode 100644
index 00000000..55a6a4b7
--- /dev/null
+++ b/VVVV.gitignore
@@ -0,0 +1,7 @@
+
+# .v4p backup files
+*~.xml
+
+# Dynamic plugins .dll
+bin/
+
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
index 99456160..c273fc5c 100644
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@@ -7,20 +7,29 @@
 *.sln.docstates
 
 # Build results
-
 [Dd]ebug/
+[Dd]ebugPublic/
 [Rr]elease/
 x64/
 build/
+bld/
 [Bb]in/
 [Oo]bj/
 
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
 *_i.c
 *_p.c
+*_i.h
 *.ilk
 *.meta
 *.obj
@@ -40,9 +49,12 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
+*.svclog
 *.scc
 
+# Chutzpah Test files
+_Chutzpah*
+
 # Visual C++ cache files
 ipch/
 *.aps
@@ -56,12 +68,19 @@ ipch/
 *.vsp
 *.vspx
 
+# TFS 2012 Local Workspace
+$tf/
+
 # Guidance Automation Toolkit
 *.gpState
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
 
 # TeamCity is a build add-in
 _TeamCity*
@@ -71,8 +90,13 @@ _TeamCity*
 
 # NCrunch
 *.ncrunch*
+_NCrunch_*
 .*crunch*.local.xml
 
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
 # Installshield output folder
 [Ee]xpress/
 
@@ -91,14 +115,16 @@ publish/
 
 # Publish Web Output
 *.Publish.xml
-*.pubxml
+*.azurePubxml
 
 # NuGet Packages Directory
 ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
 #packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
 
 # Windows Azure Build Output
-csx
+csx/
 *.build.csdef
 
 # Windows Store app package directory
@@ -112,6 +138,7 @@ ClientBin/
 ~$*
 *~
 *.dbmdl
+*.dbproj.schemaview
 *.[Pp]ublish.xml
 *.pfx
 *.publishsettings
@@ -130,6 +157,14 @@ UpgradeLog*.htm
 App_Data/*.mdf
 App_Data/*.ldf
 
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
 # =========================
 # Windows detritus
 # =========================
@@ -143,6 +178,3 @@ Desktop.ini
 
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
-
-# Mac crap
-.DS_Store
diff --git a/WordPress.gitignore b/WordPress.gitignore
index 6ff1e08d..8e22e0e2 100644
--- a/WordPress.gitignore
+++ b/WordPress.gitignore
@@ -1,5 +1,4 @@
 .htaccess
-wp-config.php
 wp-content/uploads/
 wp-content/blogs.dir/
 wp-content/upgrade/
@@ -10,4 +9,4 @@ sitemap.xml
 *.log
 wp-content/cache/
 wp-content/backups/
-sitemap.xml.gz
\ No newline at end of file
+sitemap.xml.gz
diff --git a/Yii.gitignore b/Yii.gitignore
index 45a9a931..70f08754 100644
--- a/Yii.gitignore
+++ b/Yii.gitignore
@@ -1,3 +1,6 @@
-assets/
-protected/runtime/
-themes/classic/views/
\ No newline at end of file
+assets/*
+!assets/.gitignore
+protected/runtime/*
+!protected/runtime/.gitignore
+protected/data/*.db
+themes/classic/views/
diff --git a/ZendFramework.gitignore b/ZendFramework.gitignore
index 0b8e5951..014f93f6 100644
--- a/ZendFramework.gitignore
+++ b/ZendFramework.gitignore
@@ -3,4 +3,3 @@ LICENSE.txt
 README.txt
 demos/
 extras/documentation
-
diff --git a/nanoc.gitignore b/nanoc.gitignore
index ddc964bc..4a2728c0 100644
--- a/nanoc.gitignore
+++ b/nanoc.gitignore
@@ -5,3 +5,6 @@ output/
 
 # Temporary file directory
 tmp/
+
+# Crash Log
+crash.log