Merge branch 'master' into tabs-studio

42 files changed, 302 insertions, 288 deletions

diff --git a/Android.gitignore b/Android.gitignore
index d028d125..520a8635 100644
--- a/Android.gitignore
+++ b/Android.gitignore
@@ -37,6 +37,7 @@ captures/
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
+.idea/dictionaries
 .idea/libraries
 
 # Keystore files
@@ -44,3 +45,11 @@ captures/
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
diff --git a/C.gitignore b/C.gitignore
index 8a365b3d..c6127b38 100644
--- a/C.gitignore
+++ b/C.gitignore
@@ -45,6 +45,7 @@
 # Kernel Module Compile Results
 *.mod*
 *.cmd
+.tmp_versions/
 modules.order
 Module.symvers
 Mkfile.old
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 91543ab4..1b94f6cb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,6 +28,11 @@ high quality, we request that contributions adhere to the following guidelines.
 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.
 
+If a template is mostly a list of files installed by a particular version of
+some software (e.g. a PHP framework) then it's brittle and probably no more
+helpful than a simple `ls`. If it's not possible to curate a small set of
+useful rules, then the template might not be a good fit for this collection.
+
 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
diff --git a/CodeIgniter.gitignore b/CodeIgniter.gitignore
index 60571a0c..bfea17cd 100644
--- a/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@@ -9,3 +9,9 @@ user_guide_src/build/*
 user_guide_src/cilexer/build/*
 user_guide_src/cilexer/dist/*
 user_guide_src/cilexer/pycilexer.egg-info/*
+
+#codeigniter 3
+application/logs/*
+!application/logs/index.html
+!application/logs/.htaccess
+/vendor/
diff --git a/Dart.gitignore b/Dart.gitignore
index 4b366585..4d2a4d6d 100644
--- a/Dart.gitignore
+++ b/Dart.gitignore
@@ -1,33 +1,12 @@
 # See https://www.dartlang.org/tools/private-files.html
 
 # Files and directories created by pub
-
-# SDK 1.20 and later (no longer creates packages directories)
 .packages
 .pub/
 build/
-
-# Older SDK versions
-# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
-.project
-.buildlog
-**/packages/
-
-
-# Files created by dart2js
-# (Most Dart developers will use pub build to compile Dart, use/modify these 
-#  rules if you intend to use dart2js directly
-#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
-#  differentiate from explicit Javascript files)
-*.dart.js
-*.part.js
-*.js.deps
-*.js.map
-*.info.json
+# If you're building an application, you may want to check-in your pubspec.lock
+pubspec.lock
 
 # Directory created by dartdoc
+# If you don't generate documentation locally you can remove this line.
 doc/api/
-
-# Don't commit pubspec lock file 
-# (Library packages only! Remove pattern if developing an application package)
-pubspec.lock
diff --git a/Global/Archives.gitignore b/Global/Archives.gitignore
index e9eda68b..43fd5582 100644
--- a/Global/Archives.gitignore
+++ b/Global/Archives.gitignore
@@ -5,17 +5,18 @@
 *.rar
 *.zip
 *.gz
+*.tgz
 *.bzip
 *.bz2
 *.xz
 *.lzma
 *.cab
 
-#packing-only formats
+# Packing-only formats
 *.iso
 *.tar
 
-#package management formats
+# Package management formats
 *.dmg
 *.xpi
 *.gem
diff --git a/Global/Eclipse.gitignore b/Global/Eclipse.gitignore
index 31c9fb31..ce1c12cd 100644
--- a/Global/Eclipse.gitignore
+++ b/Global/Eclipse.gitignore
@@ -11,9 +11,6 @@ local.properties
 .loadpath
 .recommenders
 
-# Eclipse Core
-.project
-
 # External tool builders
 .externalToolBuilders/
 
@@ -26,9 +23,6 @@ local.properties
 # CDT-specific (C/C++ Development Tooling)
 .cproject
 
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
 # Java annotation processor (APT)
 .factorypath
 
@@ -49,3 +43,8 @@ local.properties
 
 # Code Recommenders
 .recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
diff --git a/Global/JEnv.gitignore b/Global/JEnv.gitignore
new file mode 100644
index 00000000..d838300a
--- /dev/null
+++ b/Global/JEnv.gitignore
@@ -0,0 +1,5 @@
+# JEnv local Java version configuration file
+.java-version
+
+# Used by previous versions of JEnv
+.jenv-version
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
index e375c744..ff23445e 100644
--- a/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@ -2,24 +2,28 @@
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-.idea/workspace.xml
-.idea/tasks.xml
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
 
 # Sensitive or high-churn files:
-.idea/dataSources/
-.idea/dataSources.ids
-.idea/dataSources.xml
-.idea/dataSources.local.xml
-.idea/sqlDataSources.xml
-.idea/dynamic.xml
-.idea/uiDesigner.xml
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.xml
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
 
 # Gradle:
-.idea/gradle.xml
-.idea/libraries
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# CMake
+cmake-build-debug/
 
 # Mongo Explorer plugin:
-.idea/mongoSettings.xml
+.idea/**/mongoSettings.xml
 
 ## File-based project format:
 *.iws
@@ -35,6 +39,9 @@
 # JIRA plugin
 atlassian-ide-plugin.xml
 
+# Cursive Clojure plugin
+.idea/replstate.xml
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
diff --git a/Global/Matlab.gitignore b/Global/Matlab.gitignore
index 32a5ad4c..09dfde64 100644
--- a/Global/Matlab.gitignore
+++ b/Global/Matlab.gitignore
@@ -17,3 +17,6 @@ slprj/
 
 # Session info
 octave-workspace
+
+# Simulink autosave extension
+.autosave
diff --git a/Global/MicrosoftOffice.gitignore b/Global/MicrosoftOffice.gitignore
index cb891745..0c203662 100644
--- a/Global/MicrosoftOffice.gitignore
+++ b/Global/MicrosoftOffice.gitignore
@@ -13,4 +13,4 @@
 ~$*.ppt*
 
 # Visio autosave temporary files
-*.~vsdx
+*.~vsd*
diff --git a/Global/SBT.gitignore b/Global/SBT.gitignore
index 970d897c..5ed6acb6 100644
--- a/Global/SBT.gitignore
+++ b/Global/SBT.gitignore
@@ -1,9 +1,12 @@
 # Simple Build Tool
 # http://www.scala-sbt.org/release/docs/Getting-Started/Directories.html#configuring-version-control
 
+dist/*
 target/
 lib_managed/
 src_managed/
 project/boot/
+project/plugins/project/
 .history
 .cache
+.lib/
diff --git a/Global/Stata.gitignore b/Global/Stata.gitignore
new file mode 100644
index 00000000..07997bb1
--- /dev/null
+++ b/Global/Stata.gitignore
@@ -0,0 +1,24 @@
+# .gitignore file for git projects containing Stata files
+# Commercial statistical software: http://www.stata.com
+
+# Stata dataset and output files
+*.dta
+*.gph
+*.log
+*.smcl
+*.stpr
+*.stsem
+
+# Graphic export files from Stata
+# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf
+#
+# You may add graphic export files to your .gitignore. However you should be
+# aware that this will exclude all image files from this main directory
+# and subdirectories.
+# *.ps
+# *.eps
+# *.wmf
+# *.emf
+# *.pdf
+# *.png
+# *.tif
diff --git a/Global/SublimeText.gitignore b/Global/SublimeText.gitignore
index 95ff2244..86c3fa45 100644
--- a/Global/SublimeText.gitignore
+++ b/Global/SublimeText.gitignore
@@ -1,16 +1,16 @@
-# cache files for sublime text
+# Cache files for Sublime Text
 *.tmlanguage.cache
 *.tmPreferences.cache
 *.stTheme.cache
 
-# workspace files are user-specific
+# 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
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
 # *.sublime-project
 
-# sftp configuration file
+# SFTP configuration file
 sftp-config.json
 
 # Package control specific files
diff --git a/Global/Vagrant.gitignore b/Global/Vagrant.gitignore
index a977916f..93987ca0 100644
--- a/Global/Vagrant.gitignore
+++ b/Global/Vagrant.gitignore
@@ -1 +1,5 @@
+# General
 .vagrant/
+
+# Log files (if you are creating logs in debug mode, uncomment this)
+# *.logs
diff --git a/Global/Vim.gitignore b/Global/Vim.gitignore
index 42e7afc1..6d21783d 100644
--- a/Global/Vim.gitignore
+++ b/Global/Vim.gitignore
@@ -1,12 +1,14 @@
-# swap
+# Swap
 [._]*.s[a-v][a-z]
 [._]*.sw[a-p]
 [._]s[a-v][a-z]
 [._]sw[a-p]
-# session
+
+# Session
 Session.vim
-# temporary
+
+# Temporary
 .netrwhist
 *~
-# auto-generated tag files
+# Auto-generated tag files
 tags
diff --git a/Global/Windows.gitignore b/Global/Windows.gitignore
index ba26afd9..dff26a9a 100644
--- a/Global/Windows.gitignore
+++ b/Global/Windows.gitignore
@@ -3,6 +3,9 @@ Thumbs.db
 ehthumbs.db
 ehthumbs_vista.db
 
+# Dump file
+*.stackdump
+
 # Folder config file
 Desktop.ini
 
diff --git a/Global/macOS.gitignore b/Global/macOS.gitignore
index f0f3fbc0..9d1061e8 100644
--- a/Global/macOS.gitignore
+++ b/Global/macOS.gitignore
@@ -1,26 +1,26 @@
-*.DS_Store

-.AppleDouble

-.LSOverride

-

-# Icon must end with two \r

-Icon

-

-

-# Thumbnails

-._*

-

-# Files that might appear in the root of a volume

-.DocumentRevisions-V100

-.fseventsd

-.Spotlight-V100

-.TemporaryItems

-.Trashes

-.VolumeIcon.icns

-.com.apple.timemachine.donotpresent

-

-# Directories potentially created on remote AFP share

-.AppleDB

-.AppleDesktop

-Network Trash Folder

-Temporary Items

-.apdisk

+# General
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon


+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
diff --git a/Go.gitignore b/Go.gitignore
index 5e1047c9..a1338d68 100644
--- a/Go.gitignore
+++ b/Go.gitignore
@@ -1,30 +1,14 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
+# Binaries for programs and plugins
+*.exe
+*.dll
 *.so
+*.dylib
 
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
+# Test binary, build with `go test -c`
 *.test
-*.prof
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
-# External packages folder
-vendor/
+# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
+.glide/
diff --git a/Java.gitignore b/Java.gitignore
index e44e0860..6143e53f 100644
--- a/Java.gitignore
+++ b/Java.gitignore
@@ -1,5 +1,9 @@
+# Compiled class file
 *.class
 
+# Log file
+*.log
+
 # BlueJ files
 *.ctxt
 
@@ -10,6 +14,9 @@
 *.jar
 *.war
 *.ear
+*.zip
+*.tar.gz
+*.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
diff --git a/Joomla.gitignore b/Joomla.gitignore
index 93103fdb..53a74e74 100644
--- a/Joomla.gitignore
+++ b/Joomla.gitignore
@@ -29,8 +29,6 @@
 /administrator/components/com_search/*
 /administrator/components/com_templates/*
 /administrator/components/com_users/*
-/administrator/components/com_weblinks/*
-/administrator/components/index.html
 /administrator/help/*
 /administrator/includes/*
 /administrator/language/en-GB/en-GB.com_ajax.ini
@@ -41,7 +39,6 @@
 /administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
 /administrator/language/en-GB/en-GB.com_postinstall.ini
 /administrator/language/en-GB/en-GB.com_postinstall.sys.ini
-/administrator/language/en-GB/en-GB.com_sitemapjen.sys.ini
 /administrator/language/en-GB/en-GB.com_tags.ini
 /administrator/language/en-GB/en-GB.com_tags.sys.ini
 /administrator/language/en-GB/en-GB.mod_stats_admin.ini
@@ -250,15 +247,10 @@
 /administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
 /administrator/language/en-GB/en-GB.plg_user_profile.ini
 /administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
-/administrator/language/en-GB/en-GB.tpl_bluestork.ini
-/administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini
 /administrator/language/en-GB/en-GB.tpl_hathor.ini
 /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 /administrator/language/en-GB/en-GB.xml
-/administrator/language/en-GB/index.html
-/administrator/language/ru-RU/index.html
 /administrator/language/overrides/*
-/administrator/language/index.html
 /administrator/logs/index.html
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
@@ -278,12 +270,9 @@
 /administrator/modules/mod_unread/*
 /administrator/modules/mod_version/*
 /administrator/modules/mod_stats_admin/*
-/administrator/modules/index.html
-/administrator/templates/bluestork/*
 /administrator/templates/isis/*
 /administrator/templates/hathor/*
 /administrator/templates/system/*
-/administrator/templates/index.html
 /administrator/index.php
 /cache/*
 /bin/*
@@ -302,7 +291,6 @@
 /components/com_newsfeeds/*
 /components/com_search/*
 /components/com_users/*
-/components/com_weblinks/*
 /components/com_wrapper/*
 /components/index.html
 /images/banners/*
@@ -403,7 +391,6 @@
 /language/en-GB/en-GB.tpl_beez5.ini
 /language/en-GB/en-GB.tpl_beez5.sys.ini
 /language/en-GB/en-GB.xml
-/language/en-GB/index.html
 /language/en-GB/install.xml
 /language/overrides/*
 /language/index.html
@@ -428,8 +415,6 @@
 /libraries/index.html
 /libraries/import.php
 /libraries/loader.php
-/libraries/platform.php
-/logs/*
 /media/cms/*
 /media/com_contenthistory/*
 /media/com_finder/*
@@ -472,7 +457,6 @@
 /modules/mod_tags_popular/*
 /modules/mod_tags_similar/*
 /modules/mod_users_latest/*
-/modules/mod_weblinks/*
 /modules/mod_whosonline/*
 /modules/mod_wrapper/*
 /modules/index.html
@@ -481,9 +465,7 @@
 /plugins/authentication/joomla/*
 /plugins/authentication/ldap/*
 /plugins/authentication/cookie/*
-/plugins/authentication/index.html
 /plugins/captcha/recaptcha/*
-/plugins/captcha/index.html
 /plugins/content/emailcloak/*
 /plugins/content/example/*
 /plugins/content/finder/*
@@ -494,27 +476,21 @@
 /plugins/content/pagenavigation/*
 /plugins/content/vote/*
 /plugins/content/contact/*
-/plugins/content/index.html
 /plugins/editors/codemirror/*
 /plugins/editors/none/*
 /plugins/editors/tinymce/*
-/plugins/editors/index.html
 /plugins/editors-xtd/module/*
 /plugins/editors-xtd/article/*
 /plugins/editors-xtd/image/*
 /plugins/editors-xtd/pagebreak/*
 /plugins/editors-xtd/readmore/*
-/plugins/editors-xtd/index.html
 /plugins/extension/example/*
 /plugins/extension/joomla/*
-/plugins/extension/index.html
-/plugins/finder/index.html
 /plugins/finder/categories/*
 /plugins/finder/contacts/*
 /plugins/finder/content/*
 /plugins/finder/newsfeeds/*
 /plugins/finder/tags/*
-/plugins/finder/weblinks/*
 /plugins/installer/*
 /plugins/quickicon/extensionupdate/*
 /plugins/quickicon/joomlaupdate/*
@@ -547,10 +523,7 @@
 /plugins/user/profile/*
 /plugins/user/index.html
 /plugins/index.html
-/templates/atomic/*
 /templates/beez3/*
-/templates/beez_20/*
-/templates/beez5/*
 /templates/protostar/*
 /templates/system/*
 /templates/index.html
diff --git a/Laravel.gitignore b/Laravel.gitignore
index a2d15640..a4854bef 100644
--- a/Laravel.gitignore
+++ b/Laravel.gitignore
@@ -1,5 +1,6 @@
 vendor/
 node_modules/
+npm-debug.log
 
 # Laravel 4 specific
 bootstrap/compiled.php
@@ -7,10 +8,13 @@ app/storage/
 
 # Laravel 5 & Lumen specific
 public/storage
+public/hot
 storage/*.key
 .env.*.php
 .env.php
 .env
+Homestead.yaml
+Homestead.json
 
 # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer
 .rocketeer/
diff --git a/Magento.gitignore b/Magento.gitignore
index 195c9b7a..6f1fa223 100644
--- a/Magento.gitignore
+++ b/Magento.gitignore
@@ -1,104 +1,43 @@
-.htaccess.sample
-.modgit/
-.modman/
-app/code/community/Phoenix/Moneybookers/
-app/code/community/Cm/RedisSession/
-app/code/core/
-app/design/adminhtml/default/default/
-app/design/frontend/base/
-app/design/frontend/rwd/
-app/design/frontend/default/blank/
-app/design/frontend/default/default/
-app/design/frontend/default/iphone/
-app/design/frontend/default/modern/
-app/design/frontend/enterprise/default
-app/design/install/
-app/etc/modules/Enterprise_*
-app/etc/modules/Mage_*.xml
-app/etc/modules/Phoenix_Moneybookers.xml
-app/etc/modules/Cm_RedisSession.xml
-app/etc/applied.patches.list
-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/bootstrap.php
-app/locale/en_US/
-app/Mage.php
-/cron.php
-cron.sh
-dev/.htaccess
-dev/tests/functional/
-downloader/
-errors/
-favicon.ico
-/get.php
-includes/
-/index.php
-index.php.sample
-/install.php
-js/blank.html
-js/calendar/
-js/enterprise/
-js/extjs/
-js/firebug/
-js/flash/
-js/index.php
-js/jscolor/
-js/lib/
-js/mage/
-js/prototype/
-js/scriptaculous/
-js/spacer.gif
-js/tiny_mce/
-js/varien/
-lib/3Dsecure/
-lib/Apache/
-lib/flex/
-lib/googlecheckout/
-lib/.htaccess
-lib/LinLibertineFont/
-lib/Mage/
-lib/PEAR/
-lib/Pelago/
-lib/phpseclib/
-lib/Varien/
-lib/Zend/
-lib/Cm/
-lib/Credis/
-lib/Magento/
-LICENSE_AFL.txt
-LICENSE.html
-LICENSE.txt
-LICENSE_EE*
-/mage
-media/
-/api.php
-nbproject/
-pear
-pear/
-php.ini.sample
-pkginfo/
-RELEASE_NOTES.txt
-shell/.htaccess
-shell/abstract.php
-shell/compiler.php
-shell/indexer.php
-shell/log.php
-sitemap.xml
-skin/adminhtml/default/default/
-skin/adminhtml/default/enterprise
-skin/frontend/base/
-skin/frontend/rwd/
-skin/frontend/default/blank/
-skin/frontend/default/blue/
-skin/frontend/default/default/
-skin/frontend/default/french/
-skin/frontend/default/german/
-skin/frontend/default/iphone/
-skin/frontend/default/modern/
-skin/frontend/enterprise
-skin/install/
-var/
+#--------------------------#
+# Magento Default Files    #
+#--------------------------#
+
+/app/etc/local.xml
+
+/media/*
+!/media/.htaccess
+
+!/media/customer
+/media/customer/*
+!/media/customer/.htaccess
+
+!/media/dhl
+/media/dhl/*
+!/media/dhl/logo.jpg
+
+!/media/downloadable
+/media/downloadable/*
+!/media/downloadable/.htaccess
+
+!/media/xmlconnect
+/media/xmlconnect/*
+
+!/media/xmlconnect/custom
+/media/xmlconnect/custom/*
+!/media/xmlconnect/custom/ok.gif
+
+!/media/xmlconnect/original
+/media/xmlconnect/original/*
+!/media/xmlconnect/original/ok.gif
+
+!/media/xmlconnect/system
+/media/xmlconnect/system/*
+!/media/xmlconnect/system/ok.gif
+
+/var/*
+!/var/.htaccess
+
+!/var/package
+/var/package/*
+!/var/package/*.xml
+
diff --git a/Maven.gitignore b/Maven.gitignore
index 9af45b17..5f2dbe11 100644
--- a/Maven.gitignore
+++ b/Maven.gitignore
@@ -8,5 +8,5 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
-# Exclude maven wrapper
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar
diff --git a/Node.gitignore b/Node.gitignore
index 9a439fcd..00cbbdf5 100644
--- a/Node.gitignore
+++ b/Node.gitignore
@@ -2,6 +2,8 @@
 logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Runtime data
 pids
@@ -21,6 +23,9 @@ coverage
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
 
+# Bower dependency directory (https://bower.io/)
+bower_components
+
 # node-waf configuration
 .lock-wscript
 
@@ -28,8 +33,11 @@ coverage
 build/Release
 
 # Dependency directories
-node_modules
-jspm_packages
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
 
 # Optional npm cache directory
 .npm
@@ -46,3 +54,6 @@ jspm_packages
 # Yarn Integrity file
 .yarn-integrity
 
+# dotenv environment variables file
+.env
+
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
index 58c51eca..09dfede4 100644
--- a/Objective-C.gitignore
+++ b/Objective-C.gitignore
@@ -19,7 +19,8 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
@@ -44,10 +45,10 @@ Carthage/Build
 
 # fastlane
 #
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
 fastlane/Preview.html
diff --git a/Perl.gitignore b/Perl.gitignore
index d41364ab..9bf1537f 100644
--- a/Perl.gitignore
+++ b/Perl.gitignore
@@ -4,6 +4,7 @@
 /META.json
 /MYMETA.*
 *.o
+*.pm.tdy
 *.bs
 
 # Devel::Cover
diff --git a/PlayFramework.gitignore b/PlayFramework.gitignore
index 6d67f119..ae5ec9fe 100644
--- a/PlayFramework.gitignore
+++ b/PlayFramework.gitignore
@@ -5,6 +5,7 @@ bin/
 /lib/
 /logs/
 /modules
+/project/project
 /project/target
 /target
 tmp/
diff --git a/PureScript.gitignore b/PureScript.gitignore
new file mode 100644
index 00000000..361cf527
--- /dev/null
+++ b/PureScript.gitignore
@@ -0,0 +1,8 @@
+# Dependencies
+.psci_modules
+bower_components
+node_modules
+
+# Generated files
+.psci
+output
diff --git a/Python.gitignore b/Python.gitignore
index 9a05e2de..113294a5 100644
--- a/Python.gitignore
+++ b/Python.gitignore
@@ -8,7 +8,6 @@ __pycache__/
 
 # Distribution / packaging
 .Python
-env/
 build/
 develop-eggs/
 dist/
@@ -43,7 +42,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
 
 # Translations
@@ -76,16 +75,25 @@ target/
 # celery beat schedule file
 celerybeat-schedule
 
-# dotenv
-.env
+# SageMath parsed files
+*.sage.py
 
-# virtualenv
-.venv/
+# Environments
+.env
+.venv
+env/
 venv/
 ENV/
 
 # Spyder project settings
 .spyderproject
+.spyproject
 
 # Rope project settings
 .ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
diff --git a/Qt.gitignore b/Qt.gitignore
index c7659c24..5fa47c5a 100644
--- a/Qt.gitignore
+++ b/Qt.gitignore
@@ -12,6 +12,9 @@
 
 # Qt-es
 
+object_script.*.Release
+object_script.*.Debug
+*_plugin_import.cpp
 /.qmake.cache
 /.qmake.stash
 *.pro.user
@@ -20,11 +23,17 @@
 *.qbs.user.*
 *.moc
 moc_*.cpp
+moc_*.h
 qrc_*.cpp
 ui_*.h
 Makefile*
 *build-*
 
+
+# Qt unit tests
+target_wrapper.*
+
+
 # QtCreator
 
 *.autosave
diff --git a/README.md b/README.md
index c1f8bab6..68afeff0 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,11 @@ high quality, we request that contributions adhere to the following guidelines.
 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.
 
+If a template is mostly a list of files installed by a particular version of
+some software (e.g. a PHP framework) then it's brittle and probably no more
+helpful than a simple `ls`. If it's not possible to curate a small set of
+useful rules, then the template might not be a good fit for this collection.
+
 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
diff --git a/Rails.gitignore b/Rails.gitignore
index e9742760..42aeb550 100644
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@ -8,7 +8,7 @@ capybara-*.html
 /public/system
 /coverage/
 /spec/tmp
-**.orig
+*.orig
 rerun.txt
 pickle-email-*.html
 
diff --git a/Scala.gitignore b/Scala.gitignore
index a02d882c..9c07d4ae 100644
--- a/Scala.gitignore
+++ b/Scala.gitignore
@@ -1,21 +1,2 @@
 *.class
 *.log
-
-# sbt specific
-.cache
-.history
-.lib/
-dist/*
-target/
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-
-# Scala-IDE specific
-.scala_dependencies
-.worksheet
-
-# ENSIME specific
-.ensime_cache/
-.ensime
diff --git a/SugarCRM.gitignore b/SugarCRM.gitignore
index e9270205..6a183d1c 100644
--- a/SugarCRM.gitignore
+++ b/SugarCRM.gitignore
@@ -6,7 +6,7 @@
 # the misuse of the repository as backup replacement.
 # For development the cache directory can be safely ignored and
 # therefore it is ignored.
-/cache/
+/cache/*
 !/cache/index.html
 # Ignore some files and directories from the custom directory.
 /custom/history/
@@ -22,6 +22,6 @@
 # Logs files can safely be ignored.
 *.log
 # Ignore the new upload directories.
-/upload/
+/upload/*
 !/upload/index.html
 /upload_backup/
diff --git a/Swift.gitignore b/Swift.gitignore
index 2c22487b..d5340449 100644
--- a/Swift.gitignore
+++ b/Swift.gitignore
@@ -19,7 +19,8 @@ xcuserdata/
 
 ## Other
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
@@ -35,6 +36,7 @@ playground.xcworkspace
 #
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
+# Package.pins
 .build/
 
 # CocoaPods
@@ -57,7 +59,7 @@ Carthage/Build
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
 # screenshots whenever they are needed.
 # For more information about the recommended setup visit:
-# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
 
 fastlane/report.xml
 fastlane/Preview.html
diff --git a/Symfony.gitignore b/Symfony.gitignore
index ed4d3c6c..6c224e02 100644
--- a/Symfony.gitignore
+++ b/Symfony.gitignore
@@ -25,7 +25,6 @@
 /bin/*
 !bin/console
 !bin/symfony_requirements
-/vendor/
 
 # Assets and user uploads
 /web/bundles/
@@ -38,8 +37,5 @@
 # Build data
 /build/
 
-# Composer PHAR
-/composer.phar
-
 # Backup entities generated with doctrine:generate:entities command
 **/Entity/*~
diff --git a/TeX.gitignore b/TeX.gitignore
index 69bfb1ee..a0322dbd 100644
--- a/TeX.gitignore
+++ b/TeX.gitignore
@@ -28,7 +28,6 @@
 *.blg
 *-blx.aux
 *-blx.bib
-*.brf
 *.run.xml
 
 ## Build tool auxiliary files:
@@ -77,8 +76,6 @@ acs-*.bib
 *.t[1-9]
 *.t[1-9][0-9]
 *.tfm
-*.[1-9]
-*.[1-9][0-9]
 
 #(r)(e)ledmac/(r)(e)ledpar
 *.end
@@ -134,6 +131,9 @@ acs-*.bib
 *.mlf
 *.mlt
 *.mtc[0-9]*
+*.slf[0-9]*
+*.slt[0-9]*
+*.stc[0-9]*
 
 # minted
 _minted*
@@ -142,15 +142,15 @@ _minted*
 # morewrites
 *.mw
 
-# mylatexformat
-*.fmt
-
 # nomencl
 *.nlo
 
 # pax
 *.pax
 
+# pdfpcnotes
+*.pdfpc
+
 # sagetex
 *.sagetex.sage
 *.sagetex.py
diff --git a/Unity.gitignore b/Unity.gitignore
index 6bffdb2e..eb83a8f1 100644
--- a/Unity.gitignore
+++ b/Unity.gitignore
@@ -5,6 +5,9 @@
 /[Bb]uilds/
 /Assets/AssetStoreTools*
 
+# Visual Studio 2015 cache directory
+/.vs/
+
 # Autogenerated VS/MD/Consulo solution and project files
 ExportedObj/
 .consulo/
@@ -20,7 +23,6 @@ ExportedObj/
 *.svd
 *.pdb
 
-
 # Unity3D generated meta files
 *.pidb.meta
 
diff --git a/UnrealEngine.gitignore b/UnrealEngine.gitignore
index beec7b91..6c6e1c32 100644
--- a/UnrealEngine.gitignore
+++ b/UnrealEngine.gitignore
@@ -36,6 +36,7 @@
 
 # These project files can be generated by the engine
 *.xcodeproj
+*.xcworkspace
 *.sln
 *.suo
 *.opensdf
@@ -53,9 +54,17 @@ Binaries/*
 # Builds
 Build/*
 
+# Whitelist PakBlacklist-<BuildConfiguration>.txt files
+!Build/*/
+Build/*/**
+!Build/*/PakBlacklist*.txt
+
 # Don't ignore icon files in Build
 !Build/**/*.ico
 
+# Built data for maps
+*_BuiltData.uasset
+
 # Configuration files generated by the Editor
 Saved/*
 
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
index 288955c6..22fd88a5 100644
--- a/VisualStudio.gitignore
+++ b/VisualStudio.gitignore
@@ -42,6 +42,9 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
+# Benchmark Results
+BenchmarkDotNet.Artifacts/
+
 # .NET Core
 project.lock.json
 project.fragment.lock.json
@@ -166,7 +169,7 @@ PublishScripts/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
+# NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
 
@@ -183,6 +186,7 @@ AppPackages/
 BundleArtifacts/
 Package.StoreAssociation.xml
 _pkginfo.txt
+*.appx
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -199,7 +203,6 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
 # Since there are multiple workflows, uncomment next line to ignore bower_components
@@ -220,6 +223,7 @@ UpgradeLog*.htm
 # SQL Server files
 *.mdf
 *.ldf
+*.ndf
 
 # Business Intelligence projects
 *.rdl.data
@@ -234,6 +238,10 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
 
 # Visual Studio 6 build log
 *.plg
@@ -275,4 +283,13 @@ __pycache__/
 # !tools/packages.config
 
 # Tabs Studio
-*.tss
\ No newline at end of file
+*.tss
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
diff --git a/Waf.gitignore b/Waf.gitignore
index 48e8d8f7..dad2b56b 100644
--- a/Waf.gitignore
+++ b/Waf.gitignore
@@ -1,4 +1,9 @@
-# for projects that use Waf for building: http://code.google.com/p/waf/
-.waf-*
-.waf3-*
-.lock-*
+# For projects that use the Waf build system: https://waf.io/
+# Dot-hidden on Unix-like systems
+.waf-*-*/
+.waf3-*-*/
+# Hidden directory on Windows (no dot)
+waf-*-*/
+waf3-*-*/
+# Lockfile
+.lock-waf_*_build