diff --git a/scripts/README b/contrib/README
similarity index 100%
rename from scripts/README
rename to contrib/README
diff --git a/scripts/autoboot.sh b/contrib/autoboot.sh
similarity index 100%
rename from scripts/autoboot.sh
rename to contrib/autoboot.sh
diff --git a/scripts/init/centos/gitea b/contrib/init/centos/gitea
similarity index 100%
rename from scripts/init/centos/gitea
rename to contrib/init/centos/gitea
diff --git a/scripts/init/debian/gitea b/contrib/init/debian/gitea
similarity index 100%
rename from scripts/init/debian/gitea
rename to contrib/init/debian/gitea
diff --git a/scripts/init/freebsd/gitea b/contrib/init/freebsd/gitea
similarity index 100%
rename from scripts/init/freebsd/gitea
rename to contrib/init/freebsd/gitea
diff --git a/scripts/init/gentoo/gitea b/contrib/init/gentoo/gitea
similarity index 100%
rename from scripts/init/gentoo/gitea
rename to contrib/init/gentoo/gitea
diff --git a/scripts/init/openbsd/gitea b/contrib/init/openbsd/gitea
similarity index 100%
rename from scripts/init/openbsd/gitea
rename to contrib/init/openbsd/gitea
diff --git a/scripts/init/suse/gitea b/contrib/init/suse/gitea
similarity index 100%
rename from scripts/init/suse/gitea
rename to contrib/init/suse/gitea
diff --git a/scripts/launchd/io.gitea.web.plist b/contrib/launchd/io.gitea.web.plist
similarity index 100%
rename from scripts/launchd/io.gitea.web.plist
rename to contrib/launchd/io.gitea.web.plist
diff --git a/scripts/migrate/gogs_migrate.sh b/contrib/migrate/gogs_migrate.sh
similarity index 100%
rename from scripts/migrate/gogs_migrate.sh
rename to contrib/migrate/gogs_migrate.sh
diff --git a/scripts/mysql.sql b/contrib/mysql.sql
similarity index 100%
rename from scripts/mysql.sql
rename to contrib/mysql.sql
diff --git a/scripts/supervisor/gitea b/contrib/supervisor/gitea
similarity index 100%
rename from scripts/supervisor/gitea
rename to contrib/supervisor/gitea
diff --git a/scripts/systemd/gitea.service b/contrib/systemd/gitea.service
similarity index 100%
rename from scripts/systemd/gitea.service
rename to contrib/systemd/gitea.service
diff --git a/scripts/windows/install-as-service.bat b/contrib/windows/install-as-service.bat
similarity index 100%
rename from scripts/windows/install-as-service.bat
rename to contrib/windows/install-as-service.bat
diff --git a/options/gitignore/Actionscript b/options/gitignore/Actionscript
index f112f7fb78..11e612e985 100644
--- a/options/gitignore/Actionscript
+++ b/options/gitignore/Actionscript
@@ -2,10 +2,18 @@
 bin/
 bin-debug/
 bin-release/
+[Oo]bj/ # FlashDevelop obj
+[Bb]in/ # FlashDevelop bin
 
 # Other files and folders
 .settings/
 
+# Executables
+*.swf
+*.air
+*.ipa
+*.apk
+
 # 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.
diff --git a/options/gitignore/Android b/options/gitignore/Android
index c9c2248a6a..520a86352f 100644
--- a/options/gitignore/Android
+++ b/options/gitignore/Android
@@ -2,7 +2,7 @@
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
@@ -11,6 +11,7 @@
 # Generated files
 bin/
 gen/
+out/
 
 # Gradle files
 .gradle/
@@ -30,3 +31,25 @@ proguard/
 
 # Android Studio captures folder
 captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Keystore files
+*.jks
+
+# 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/options/gitignore/Ansible b/options/gitignore/Ansible
new file mode 100644
index 0000000000..a8b42eb6ee
--- /dev/null
+++ b/options/gitignore/Ansible
@@ -0,0 +1 @@
+*.retry
diff --git a/options/gitignore/Autotools b/options/gitignore/Autotools
index 053ff52ff3..e3923f96fc 100644
--- a/options/gitignore/Autotools
+++ b/options/gitignore/Autotools
@@ -1,14 +1,33 @@
 # http://www.gnu.org/software/automake
 
 Makefile.in
+/ar-lib
+/mdate-sh
+/py-compile
+/test-driver
+/ylwrap
 
 # http://www.gnu.org/software/autoconf
 
 /autom4te.cache
+/autoscan.log
+/autoscan-*.log
 /aclocal.m4
 /compile
+/config.guess
+/config.h.in
+/config.sub
 /configure
+/configure.scan
 /depcomp
 /install-sh
 /missing
 /stamp-h1
+
+# https://www.gnu.org/software/libtool/
+
+/ltmain.sh
+
+# http://www.gnu.org/software/texinfo
+
+/texinfo.tex
diff --git a/options/gitignore/Bazaar b/options/gitignore/Bazaar
new file mode 100644
index 0000000000..3cbbcbd11e
--- /dev/null
+++ b/options/gitignore/Bazaar
@@ -0,0 +1,2 @@
+.bzr/
+.bzrignore
diff --git a/options/gitignore/C b/options/gitignore/C
index bbf313b259..8a365b3d82 100644
--- a/options/gitignore/C
+++ b/options/gitignore/C
@@ -1,9 +1,17 @@
+# Prerequisites
+*.d
+
 # Object files
 *.o
 *.ko
 *.obj
 *.elf
 
+# Linker output
+*.ilk
+*.map
+*.exp
+
 # Precompiled Headers
 *.gch
 *.pch
@@ -30,3 +38,14 @@
 
 # Debug files
 *.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
diff --git a/options/gitignore/C Sharp b/options/gitignore/C Sharp
deleted file mode 100644
index f638296449..0000000000
--- a/options/gitignore/C Sharp	
+++ /dev/null
@@ -1,108 +0,0 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-x64/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.log
-*.vspscc
-*.vssscc
-.builds
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Publish Web Output
-*.Publish.xml
-
-# NuGet Packages Directory
-packages
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
diff --git a/options/gitignore/C++ b/options/gitignore/C++
index b8bd0267bd..259148fa18 100644
--- a/options/gitignore/C++
+++ b/options/gitignore/C++
@@ -1,3 +1,6 @@
+# Prerequisites
+*.d
+
 # Compiled Object files
 *.slo
 *.lo
@@ -15,6 +18,7 @@
 
 # Fortran module files
 *.mod
+*.smod
 
 # Compiled Static libraries
 *.lai
diff --git a/options/gitignore/CMake b/options/gitignore/CMake
index b558e9afa6..9ea395f15e 100644
--- a/options/gitignore/CMake
+++ b/options/gitignore/CMake
@@ -1,6 +1,9 @@
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
+Testing
 Makefile
 cmake_install.cmake
 install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
diff --git a/options/gitignore/CVS b/options/gitignore/CVS
index 01ba863484..1695352e14 100644
--- a/options/gitignore/CVS
+++ b/options/gitignore/CVS
@@ -1,4 +1,4 @@
 /CVS/*
-*/CVS/*
+**/CVS/*
 .cvsignore
 */.cvsignore
diff --git a/options/gitignore/CakePHP b/options/gitignore/CakePHP
index 55a665e46f..c6597e4eab 100644
--- a/options/gitignore/CakePHP
+++ b/options/gitignore/CakePHP
@@ -2,8 +2,20 @@
 
 /vendor/*
 /config/app.php
-/tmp/*
+
+/tmp/cache/models/*
+!/tmp/cache/models/empty
+/tmp/cache/persistent/*
+!/tmp/cache/persistent/empty
+/tmp/cache/views/*
+!/tmp/cache/views/empty
+/tmp/sessions/*
+!/tmp/sessions/empty
+/tmp/tests/*
+!/tmp/tests/empty
+
 /logs/*
+!/logs/empty
 
 # CakePHP 2
 
diff --git a/options/gitignore/Calabash b/options/gitignore/Calabash
new file mode 100644
index 0000000000..8a75b329dc
--- /dev/null
+++ b/options/gitignore/Calabash
@@ -0,0 +1,10 @@
+# Calabash / Cucumber
+rerun/
+reports/
+screenshots/
+screenshot*.png
+test-servers/
+
+# bundler
+.bundle
+vendor
diff --git a/options/gitignore/Clojure b/options/gitignore/Clojure
index a9fe6fba80..e69de29bb2 100644
--- a/options/gitignore/Clojure
+++ b/options/gitignore/Clojure
@@ -1,13 +0,0 @@
-pom.xml
-pom.xml.asc
-*.jar
-*.class
-/lib/
-/classes/
-/target/
-/checkouts/
-.lein-deps-sum
-.lein-repl-history
-.lein-plugins/
-.lein-failures
-.nrepl-port
diff --git a/options/gitignore/CodeIgniter b/options/gitignore/CodeIgniter
index 0f77d9e1d1..bfea17cdc5 100644
--- a/options/gitignore/CodeIgniter
+++ b/options/gitignore/CodeIgniter
@@ -4,3 +4,14 @@
 */cache/*
 !*/cache/index.html
 !*/cache/.htaccess
+
+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/options/gitignore/CommonLisp b/options/gitignore/CommonLisp
index 4806e580b6..e7de127b01 100644
--- a/options/gitignore/CommonLisp
+++ b/options/gitignore/CommonLisp
@@ -1,3 +1,17 @@
 *.FASL
 *.fasl
 *.lisp-temp
+*.dfsl
+*.pfsl
+*.d64fsl
+*.p64fsl
+*.lx64fsl
+*.lx32fsl
+*.dx64fsl
+*.dx32fsl
+*.fx64fsl
+*.fx32fsl
+*.sx64fsl
+*.sx32fsl
+*.wx64fsl
+*.wx32fsl
diff --git a/options/gitignore/Composer b/options/gitignore/Composer
index 3a693c92d7..c422267842 100644
--- a/options/gitignore/Composer
+++ b/options/gitignore/Composer
@@ -1,5 +1,5 @@
 composer.phar
-vendor/
+/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
diff --git a/options/gitignore/Concrete5 b/options/gitignore/Concrete5
index 9aa215ad62..1fe53611e5 100644
--- a/options/gitignore/Concrete5
+++ b/options/gitignore/Concrete5
@@ -1,3 +1,4 @@
 config/site.php
 files/cache/*
 files/tmp/*
+.htaccess
diff --git a/options/gitignore/Coq b/options/gitignore/Coq
index d3083b3a60..f25a61d996 100644
--- a/options/gitignore/Coq
+++ b/options/gitignore/Coq
@@ -1,3 +1,30 @@
-*.vo
+.*.aux
+*.a
+*.cma
+*.cmi
+*.cmo
+*.cmx
+*.cmxa
+*.cmxs
 *.glob
+*.ml.d
+*.ml4.d
+*.mli.d
+*.mllib.d
+*.mlpack.d
+*.native
+*.o
 *.v.d
+*.vio
+*.vo
+.coq-native/
+.csdp.cache
+.lia.cache
+.nia.cache
+.nlia.cache
+.nra.cache
+csdp.cache
+lia.cache
+nia.cache
+nlia.cache
+nra.cache
diff --git a/options/gitignore/D b/options/gitignore/D
new file mode 100644
index 0000000000..74b926fc90
--- /dev/null
+++ b/options/gitignore/D
@@ -0,0 +1,24 @@
+# Compiled Object files
+*.o
+*.obj
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Compiled Static libraries
+*.a
+*.lib
+
+# Executables
+*.exe
+
+# DUB
+.dub
+docs.json
+__dummy.html
+docs/
+
+# Code coverage
+*.lst
diff --git a/options/gitignore/Dart b/options/gitignore/Dart
index 38548b3706..4d2a4d6db7 100644
--- a/options/gitignore/Dart
+++ b/options/gitignore/Dart
@@ -1,15 +1,12 @@
-# Don’t commit the following directories created by pub.
-.buildlog
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+.packages
 .pub/
 build/
-packages
-.packages
-
-# Or the files created by dart2js.
-*.dart.js
-*.js_
-*.js.deps
-*.js.map
-
-# Include when developing application packages.
+# 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/
diff --git a/options/gitignore/Delphi b/options/gitignore/Delphi
index 8d5d458f0d..19864c6bbe 100644
--- a/options/gitignore/Delphi
+++ b/options/gitignore/Delphi
@@ -20,6 +20,10 @@
 # Deployment Manager configuration file for your project. Added in Delphi XE2.
 # Uncomment this if it is not mobile development and you do not use remote debug feature.
 #*.deployproj
+# 
+# C++ object files produced when C/C++ Output file generation is configured.
+# Uncomment this if you are not using external objects (zlib library for example).
+#*.obj
 #
 
 # Delphi compiler-generated binaries (safe to delete)
@@ -37,9 +41,13 @@
 *.tds
 *.dcu
 *.lib
+*.a
+*.o
+*.ocx
 
 # Delphi autogenerated files (duplicated info)
 *.cfg
+*.hpp
 *Resource.rc
 
 # Delphi local files (user-specific info)
@@ -51,7 +59,8 @@
 
 # Delphi history and backups
 __history/
+__recovery/
 *.~*
 
-# Castalia statistics file
+# Castalia statistics file (since XE7 Castalia is distributed with Delphi)
 *.stat
diff --git a/options/gitignore/Dreamweaver b/options/gitignore/Dreamweaver
index 6a33373bdd..0621a3d53b 100644
--- a/options/gitignore/Dreamweaver
+++ b/options/gitignore/Dreamweaver
@@ -1,3 +1,7 @@
 # DW Dreamweaver added files
 _notes
+_compareTemp
+configs/
 dwsync.xml
+dw_php_codehinting.config
+*.mno
diff --git a/options/gitignore/Dropbox b/options/gitignore/Dropbox
new file mode 100644
index 0000000000..40f4a469d2
--- /dev/null
+++ b/options/gitignore/Dropbox
@@ -0,0 +1,4 @@
+# Dropbox settings and caches
+.dropbox
+.dropbox.attr
+.dropbox.cache
diff --git a/options/gitignore/Drupal b/options/gitignore/Drupal
index 04aed3b676..0d2fe537f4 100644
--- a/options/gitignore/Drupal
+++ b/options/gitignore/Drupal
@@ -15,7 +15,7 @@ robots.txt
 /MAINTAINERS.txt
 /UPGRADE.txt
 /README.txt
-sites/all/README.txt
+sites/README.txt
 sites/all/modules/README.txt
 sites/all/themes/README.txt
 
diff --git a/options/gitignore/Eagle b/options/gitignore/Eagle
index a5410348a2..9ced126026 100644
--- a/options/gitignore/Eagle
+++ b/options/gitignore/Eagle
@@ -11,6 +11,10 @@
 # comment the following line if you want to have your project file included.
 eagle.epf
 
+# Autorouter files
+*.pro
+*.job
+
 # CAM files
 *.$$$
 *.cmp
@@ -34,3 +38,7 @@ eagle.epf
 *.info
 
 *.eps
+
+# file locks introduced since 7.x
+*.lck
+
diff --git a/options/gitignore/Eclipse b/options/gitignore/Eclipse
index 0e22e957c3..4f88399d2d 100644
--- a/options/gitignore/Eclipse
+++ b/options/gitignore/Eclipse
@@ -1,6 +1,5 @@
-*.pydevproject
+
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp
@@ -10,6 +9,7 @@ tmp/
 local.properties
 .settings/
 .loadpath
+.recommenders
 
 # Eclipse Core
 .project
@@ -20,7 +20,10 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# CDT-specific
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
 .cproject
 
 # JDT-specific (Eclipse Java Development Tools)
@@ -29,11 +32,25 @@ local.properties
 # Java annotation processor (APT)
 .factorypath
 
-# PDT-specific
+# PDT-specific (PHP Development Tools)
 .buildpath
 
 # sbteclipse plugin
 .target
 
+# Tern plugin
+.tern-project
+
 # TeXlipse plugin
 .texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
diff --git a/options/gitignore/EiffelStudio b/options/gitignore/EiffelStudio
index a7ba35f824..f41b4f7021 100644
--- a/options/gitignore/EiffelStudio
+++ b/options/gitignore/EiffelStudio
@@ -1,2 +1,2 @@
-# The compilation directoy
+# The compilation directory
 EIFGENs
diff --git a/options/gitignore/Elisp b/options/gitignore/Elisp
index 9b4291b7fe..206569dc66 100644
--- a/options/gitignore/Elisp
+++ b/options/gitignore/Elisp
@@ -3,3 +3,9 @@
 
 # Packaging
 .cask
+
+# Backup files
+*~
+
+# Undo-tree save-files
+*.~undo-tree
diff --git a/options/gitignore/Elixir b/options/gitignore/Elixir
index 960767189f..ac67aaf324 100644
--- a/options/gitignore/Elixir
+++ b/options/gitignore/Elixir
@@ -1,4 +1,6 @@
 /_build
+/cover
 /deps
 erl_crash.dump
 *.ez
+*.beam
diff --git a/options/gitignore/Elm b/options/gitignore/Elm
new file mode 100644
index 0000000000..8b631e7de0
--- /dev/null
+++ b/options/gitignore/Elm
@@ -0,0 +1,4 @@
+# elm-package generated files
+elm-stuff
+# elm-repl generated files
+repl-temp-*
diff --git a/options/gitignore/Emacs b/options/gitignore/Emacs
index e5327badb1..3ac7904dcd 100644
--- a/options/gitignore/Emacs
+++ b/options/gitignore/Emacs
@@ -30,3 +30,16 @@ tramp
 
 # cask packages
 .cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
diff --git a/options/gitignore/Erlang b/options/gitignore/Erlang
index 8e46d5a07f..3826c85736 100644
--- a/options/gitignore/Erlang
+++ b/options/gitignore/Erlang
@@ -4,7 +4,7 @@ deps
 *.beam
 *.plt
 erl_crash.dump
-ebin
+ebin/*.beam
 rel/example_project
 .concrete/DEV_MODE
 .rebar
diff --git a/options/gitignore/ExtJs b/options/gitignore/ExtJs
index 5ffc21546e..c92aea0fe0 100644
--- a/options/gitignore/ExtJs
+++ b/options/gitignore/ExtJs
@@ -1,4 +1,12 @@
 .architect
+bootstrap.css
+bootstrap.js
 bootstrap.json
+bootstrap.jsonp
 build/
+classic.json
+classic.jsonp
 ext/
+modern.json
+modern.jsonp
+resources/sass/.sass-cache/
diff --git a/options/gitignore/FSharp b/options/gitignore/FSharp
deleted file mode 100644
index 6c914f7480..0000000000
--- a/options/gitignore/FSharp
+++ /dev/null
@@ -1,114 +0,0 @@
-# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
-[Oo]bj/
-
-# mstest test results
-TestResults
-
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-
-# Build results
-[Dd]ebug/
-[Rr]elease/
-x64/
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.log
-*.vspscc
-*.vssscc
-.builds
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish
-
-# Publish Web Output
-*.Publish.xml
-
-# NuGet Packages Directory
-packages
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-[Bb]in
-[Oo]bj
-sql
-TestResults
-[Tt]est[Rr]esult*
-*.Cache
-ClientBin
-[Ss]tyle[Cc]op.*
-~$*
-*.dbmdl
-Generated_Code #added for RIA/Silverlight projects
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-
-#FSharp
-paket.exe
-paket-files/
-.fake
-
diff --git a/options/gitignore/Fortran b/options/gitignore/Fortran
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/options/gitignore/FuelPHP b/options/gitignore/FuelPHP
index 7804d8d22e..d69f71f433 100644
--- a/options/gitignore/FuelPHP
+++ b/options/gitignore/FuelPHP
@@ -1,2 +1,21 @@
-fuel/app/logs/*/*/*
-fuel/app/cache/*/*
+# the composer package lock file and install directory
+# 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
+/fuel/vendor
+
+# the fuelphp document
+/docs/
+
+# you may install these packages with `oil package`.
+# http://fuelphp.com/docs/packages/oil/package.html
+# /fuel/packages/auth/
+# /fuel/packages/email/
+# /fuel/packages/oil/
+# /fuel/packages/orm/
+# /fuel/packages/parser/
+
+# dynamically generated files
+/fuel/app/logs/*/*/*
+/fuel/app/cache/*/*
+/fuel/app/config/crypt.php
diff --git a/options/gitignore/GPG b/options/gitignore/GPG
new file mode 100644
index 0000000000..7740a01538
--- /dev/null
+++ b/options/gitignore/GPG
@@ -0,0 +1,2 @@
+secring.*
+
diff --git a/options/gitignore/Go b/options/gitignore/Go
index daf913b1b3..a1338d6851 100644
--- a/options/gitignore/Go
+++ b/options/gitignore/Go
@@ -1,24 +1,14 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
+# Binaries for programs and plugins
 *.exe
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
 *.test
-*.prof
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
+.glide/
diff --git a/options/gitignore/Gradle b/options/gitignore/Gradle
index 302a5f2ff1..a1fc39c070 100644
--- a/options/gitignore/Gradle
+++ b/options/gitignore/Gradle
@@ -1,8 +1,14 @@
 .gradle
-build/
+/build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/options/gitignore/Haskell b/options/gitignore/Haskell
index cdc3c4dce7..450f32ec40 100644
--- a/options/gitignore/Haskell
+++ b/options/gitignore/Haskell
@@ -1,4 +1,5 @@
 dist
+dist-*
 cabal-dev
 *.o
 *.hi
@@ -13,4 +14,7 @@ cabal.sandbox.config
 *.prof
 *.aux
 *.hp
+*.eventlog
 .stack-work/
+cabal.project.local
+.HTF/
diff --git a/options/gitignore/IPythonNotebook b/options/gitignore/IPythonNotebook
deleted file mode 100644
index 27c13510bf..0000000000
--- a/options/gitignore/IPythonNotebook
+++ /dev/null
@@ -1,2 +0,0 @@
-# Temporary data
-.ipynb_checkpoints/
diff --git a/options/gitignore/Java b/options/gitignore/Java
index 32858aad3c..6143e53f9e 100644
--- a/options/gitignore/Java
+++ b/options/gitignore/Java
@@ -1,5 +1,12 @@
+# Compiled class file
 *.class
 
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
 # Mobile Tools for Java (J2ME)
 .mtj.tmp/
 
@@ -7,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/options/gitignore/JetBrains b/options/gitignore/JetBrains
index 573bcf4552..a5d4cc86d3 100644
--- a/options/gitignore/JetBrains
+++ b/options/gitignore/JetBrains
@@ -1,32 +1,28 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
-
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/dictionaries
 
 # Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.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
 
 # Mongo Explorer plugin:
-# .idea/mongoSettings.xml
+.idea/**/mongoSettings.xml
 
 ## File-based project format:
-*.ipr
 *.iws
 
 ## Plugin-specific files:
@@ -40,7 +36,11 @@
 # 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
 crashlytics-build.properties
+fabric.properties
diff --git a/options/gitignore/Joomla b/options/gitignore/Joomla
index cf36d8cf52..53a74e7465 100644
--- a/options/gitignore/Joomla
+++ b/options/gitignore/Joomla
@@ -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
@@ -52,6 +49,7 @@
 /administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
 /administrator/language/en-GB/en-GB.plg_content_finder.ini
 /administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
+/administrator/language/en-GB/en-GB.plg_editors-xtd_module*
 /administrator/language/en-GB/en-GB.plg_finder_categories.ini
 /administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
 /administrator/language/en-GB/en-GB.plg_finder_contacts.ini
@@ -64,6 +62,10 @@
 /administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
 /administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
 /administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
+/administrator/language/en-GB/en-GB.plg_installer_folderinstaller*
+/administrator/language/en-GB/en-GB.plg_installer_packageinstaller*
+/administrator/language/en-GB/en-GB.plg_installer_packageinstaller
+/administrator/language/en-GB/en-GB.plg_installer_urlinstaller*
 /administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
 /administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
 /administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -72,6 +74,8 @@
 /administrator/language/en-GB/en-GB.plg_search_tags.sys.ini
 /administrator/language/en-GB/en-GB.plg_system_languagecode.ini
 /administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+/administrator/language/en-GB/en-GB.plg_system_stats*
+/administrator/language/en-GB/en-GB.plg_system_updatenotification*
 /administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
 /administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
 /administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
@@ -243,14 +247,11 @@
 /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/overrides/*
-/administrator/language/index.html
+/administrator/logs/index.html
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
 /administrator/modules/mod_feed/*
@@ -269,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/*
@@ -289,13 +287,14 @@
 /components/com_finder/*
 /components/com_mailto/*
 /components/com_media/*
+/components/com_modules/*
 /components/com_newsfeeds/*
 /components/com_search/*
 /components/com_users/*
-/components/com_weblinks/*
 /components/com_wrapper/*
 /components/index.html
 /images/banners/*
+/images/headers/*
 /images/sampledata/*
 /images/joomla*
 /images/index.html
@@ -309,6 +308,7 @@
 /language/en-GB/en-GB.com_tags.ini
 /language/en-GB/en-GB.finder_cli.ini
 /language/en-GB/en-GB.lib_fof.sys.ini
+/language/en-GB/en-GB.lib_fof.ini
 /language/en-GB/en-GB.com_content.ini
 /language/en-GB/en-GB.lib_idna_convert.sys.ini
 /language/en-GB/en-GB.com_mailto.ini
@@ -391,32 +391,47 @@
 /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
+/layouts/joomla/*
+/layouts/libraries/*
+/layouts/plugins/*
+/layouts/index.html
 /libraries/cms.php
 /libraries/cms/*
+/libraries/fof/*
+/libraries/idna_convert/*
 /libraries/joomla/*
+/libraries/legacy/*
+/libraries/php-encryption/*
+/libraries/phpass/*
 /libraries/phpmailer/*
 /libraries/phputf8/*
 /libraries/simplepie/*
+/libraries/vendor/*
+/libraries/classmap.php
+/libraries/import.legacy.php
 /libraries/index.html
 /libraries/import.php
 /libraries/loader.php
-/libraries/platform.php
-/logs/*
 /media/cms/*
+/media/com_contenthistory/*
 /media/com_finder/*
+/media/com_joomlaupdate/*
+/media/com_wrapper/*
 /media/contacts/*
 /media/editors/*
+/media/jui/*
 /media/mailto/*
 /media/media/*
 /media/mod_languages/*
 /media/overrider/*
+/media/plg_captcha_recaptcha/*
 /media/plg_quickicon_extensionupdate/*
 /media/plg_quickicon_joomlaupdate/*
 /media/plg_system_highlight/*
+/media/plg_system_stats/*
 /media/system/*
 /media/index.html
 /modules/mod_articles_archive/*
@@ -439,8 +454,9 @@
 /modules/mod_search/*
 /modules/mod_stats/*
 /modules/mod_syndicate/*
+/modules/mod_tags_popular/*
+/modules/mod_tags_similar/*
 /modules/mod_users_latest/*
-/modules/mod_weblinks/*
 /modules/mod_whosonline/*
 /modules/mod_wrapper/*
 /modules/index.html
@@ -448,9 +464,8 @@
 /plugins/authentication/gmail/*
 /plugins/authentication/joomla/*
 /plugins/authentication/ldap/*
-/plugins/authentication/index.html
+/plugins/authentication/cookie/*
 /plugins/captcha/recaptcha/*
-/plugins/captcha/index.html
 /plugins/content/emailcloak/*
 /plugins/content/example/*
 /plugins/content/finder/*
@@ -461,26 +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/*
@@ -503,6 +513,8 @@
 /plugins/system/redirect/*
 /plugins/system/remember/*
 /plugins/system/sef/*
+/plugins/system/stats/*
+/plugins/system/updatenotification/*
 /plugins/system/index.html
 /plugins/twofactorauth/*
 /plugins/user/contactcreator/*
@@ -511,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
@@ -523,3 +532,4 @@
 /index.php
 /joomla.xml
 /*.txt
+/robots.txt.dist
diff --git a/options/gitignore/Julia b/options/gitignore/Julia
new file mode 100644
index 0000000000..381e0b6d25
--- /dev/null
+++ b/options/gitignore/Julia
@@ -0,0 +1,4 @@
+*.jl.cov
+*.jl.*.cov
+*.jl.mem
+deps/deps.jl
diff --git a/options/gitignore/KiCAD b/options/gitignore/KiCAD
index a9e50ba43c..208bc4fc59 100644
--- a/options/gitignore/KiCAD
+++ b/options/gitignore/KiCAD
@@ -1,13 +1,21 @@
-# For PCBs designed using KiCAD: http://www.kicad-pcb.org/
+# For PCBs designed using KiCad: http://www.kicad-pcb.org/
 
 # Temporary files
 *.000
 *.bak
 *.bck
 *.kicad_pcb-bak
+*~
+_autosave-*
+*.tmp
 
 # Netlist files (exported from Eeschema)
 *.net
 
 # Autorouter files (exported from Pcbnew)
-.dsn
+*.dsn
+*.ses
+
+# Exported BOM files
+*.xml
+*.csv
diff --git a/options/gitignore/Laravel b/options/gitignore/Laravel
index 36d7adeb76..a4854bef53 100644
--- a/options/gitignore/Laravel
+++ b/options/gitignore/Laravel
@@ -1,4 +1,20 @@
-/bootstrap/compiled.php
+vendor/
+node_modules/
+npm-debug.log
+
+# Laravel 4 specific
+bootstrap/compiled.php
+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/options/gitignore/Leiningen b/options/gitignore/Leiningen
index 47fed6c20d..a9fe6fba80 100644
--- a/options/gitignore/Leiningen
+++ b/options/gitignore/Leiningen
@@ -1,6 +1,7 @@
 pom.xml
 pom.xml.asc
-*jar
+*.jar
+*.class
 /lib/
 /classes/
 /target/
diff --git a/options/gitignore/Linux b/options/gitignore/Linux
index 5932ea1797..b56bf65d85 100644
--- a/options/gitignore/Linux
+++ b/options/gitignore/Linux
@@ -1,7 +1,13 @@
 *~
 
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
 # KDE directory preferences
 .directory
 
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
diff --git a/options/gitignore/Magento b/options/gitignore/Magento
index e2ea013328..b282f5cf54 100644
--- a/options/gitignore/Magento
+++ b/options/gitignore/Magento
@@ -1,126 +1,16 @@
-.htaccess.sample
-.modgit/
-.modman/
-app/code/community/Phoenix/
-app/code/community/Cm/
-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_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_ConfigurableSwatches.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
-app/etc/modules/Mage_Widget.xml
-app/etc/modules/Mage_XmlConnect.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/locale/
-app/Mage.php
-/cron.php
-cron.sh
-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/customer/
-media/dhl/
-media/downloadable/
-media/.htaccess
-media/import/
-media/xmlconnect/
-media/catalog/product/cache/
-media/catalog/product/placeholder/default/
-/api.php
-nbproject/
-pear
-pear/
-php.ini.sample
-pkginfo/
-RELEASE_NOTES.txt
-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/.htaccess
+!/media/dhl/logo.jpg
+!/media/downloadable/.htaccess
+!/media/xmlconnect/custom/ok.gif
+!/media/xmlconnect/original/ok.gif
+!/media/xmlconnect/system/ok.gif
+/var/*
+!/var/.htaccess
+!/var/package/*.xml
diff --git a/options/gitignore/Matlab b/options/gitignore/Matlab
index 79bc56cddd..09dfde64b5 100644
--- a/options/gitignore/Matlab
+++ b/options/gitignore/Matlab
@@ -14,3 +14,9 @@
 
 # Simulink Code Generation
 slprj/
+
+# Session info
+octave-workspace
+
+# Simulink autosave extension
+.autosave
diff --git a/options/gitignore/Maven b/options/gitignore/Maven
index 1cdc9f7fd4..5f2dbe11df 100644
--- a/options/gitignore/Maven
+++ b/options/gitignore/Maven
@@ -7,3 +7,6 @@ release.properties
 dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
+
+# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
+!/.mvn/wrapper/maven-wrapper.jar
diff --git a/options/gitignore/MicrosoftOffice b/options/gitignore/MicrosoftOffice
index 412297bb99..cb89174566 100644
--- a/options/gitignore/MicrosoftOffice
+++ b/options/gitignore/MicrosoftOffice
@@ -8,3 +8,9 @@
 
 # Excel Backup File
 *.xlk
+
+# PowerPoint temporary
+~$*.ppt*
+
+# Visio autosave temporary files
+*.~vsdx
diff --git a/options/gitignore/Nanoc b/options/gitignore/Nanoc
index abc21828a3..3f36ea2a87 100644
--- a/options/gitignore/Nanoc
+++ b/options/gitignore/Nanoc
@@ -1,6 +1,6 @@
-# For projects using nanoc (http://nanoc.ws/)
+# For projects using Nanoc (http://nanoc.ws/)
 
-# Default location for output, needs to match output_dir's value found in config.yaml
+# Default location for output (needs to match output_dir's value found in nanoc.yaml)
 output/
 
 # Temporary file directory
diff --git a/options/gitignore/NetBeans b/options/gitignore/NetBeans
index debe0e48ef..254108cd23 100644
--- a/options/gitignore/NetBeans
+++ b/options/gitignore/NetBeans
@@ -3,6 +3,4 @@ build/
 nbbuild/
 dist/
 nbdist/
-nbactions.xml
-nb-configuration.xml
 .nb-gradle/
diff --git a/options/gitignore/Node b/options/gitignore/Node
index b38069de7c..00cbbdf53f 100644
--- a/options/gitignore/Node
+++ b/options/gitignore/Node
@@ -2,11 +2,14 @@
 logs
 *.log
 npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Runtime data
 pids
 *.pid
 *.seed
+*.pid.lock
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
@@ -14,15 +17,43 @@ lib-cov
 # Coverage directory used by tools like istanbul
 coverage
 
+# nyc test coverage
+.nyc_output
+
 # 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
 
 # Compiled binary addons (http://nodejs.org/api/addons.html)
 build/Release
 
-# Dependency directory
-# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
-node_modules
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
diff --git a/options/gitignore/Objective-C b/options/gitignore/Objective-C
index 05096f66ef..09dfede481 100644
--- a/options/gitignore/Objective-C
+++ b/options/gitignore/Objective-C
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,25 +15,26 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
 
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-#Pods/
+# Pods/
 
 # Carthage
 #
@@ -41,3 +42,22 @@ xcuserdata
 # Carthage/Checkouts
 
 Carthage/Build
+
+# fastlane
+#
+# 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://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/
diff --git a/options/gitignore/OpenCart b/options/gitignore/OpenCart
index cc937674b8..97be41faa3 100644
--- a/options/gitignore/OpenCart
+++ b/options/gitignore/OpenCart
@@ -9,3 +9,12 @@ image/data/
 image/cache/
 system/cache/
 system/logs/
+
+system/storage/
+
+# vQmod log files
+vqmod/logs/*
+# vQmod cache files
+vqmod/vqcache/*
+vqmod/checked.cache
+vqmod/mods.cache
diff --git a/options/gitignore/Otto b/options/gitignore/Otto
new file mode 100644
index 0000000000..5aa263f9db
--- /dev/null
+++ b/options/gitignore/Otto
@@ -0,0 +1 @@
+.otto/
diff --git a/options/gitignore/Perl b/options/gitignore/Perl
index ae2ad536ab..9bf1537f6a 100644
--- a/options/gitignore/Perl
+++ b/options/gitignore/Perl
@@ -1,20 +1,35 @@
-/blib/
-/.build/
-_build/
-cover_db/
-inc/
-Build
 !Build/
-Build.bat
 .last_cover_stats
-/Makefile
-/Makefile.old
-/MANIFEST.bak
 /META.yml
 /META.json
 /MYMETA.*
-nytprof.out
-/pm_to_blib
 *.o
+*.pm.tdy
 *.bs
+
+# Devel::Cover
+cover_db/
+
+# Devel::NYTProf
+nytprof.out
+
+# Dizt::Zilla
+/.build/
+
+# Module::Build
+_build/
+Build
+Build.bat
+
+# Module::Install
+inc/
+
+# ExtUitls::MakeMaker
+/blib/
 /_eumm/
+/*.gz
+/Makefile
+/Makefile.old
+/MANIFEST.bak
+/pm_to_blib
+/*.zip
diff --git a/options/gitignore/PlayFramework b/options/gitignore/PlayFramework
index 4735f055fc..ae5ec9fe1d 100644
--- a/options/gitignore/PlayFramework
+++ b/options/gitignore/PlayFramework
@@ -11,7 +11,6 @@ bin/
 tmp/
 test-result
 server.pid
-*.iml
 *.eml
 /dist/
 .cache
diff --git a/options/gitignore/Prestashop b/options/gitignore/Prestashop
index 1c8462b08c..7c6ae1e31c 100644
--- a/options/gitignore/Prestashop
+++ b/options/gitignore/Prestashop
@@ -7,9 +7,16 @@ config/settings.*.php
 # The following files are generated by PrestaShop.
 
 admin-dev/autoupgrade/
-cache/
+/cache/
+!/cache/index.php
+!/cache/cachefs/index.php
+!/cache/purifier/index.php
+!/cache/push/index.php
+!/cache/sandbox/index.php
+!/cache/smarty/index.php
+!/cache/tcpdf/index.php
 config/xml/*.xml
-log/
+/log/*
 *sitemap.xml
 themes/*/cache/
 modules/*/config*.xml
@@ -21,5 +28,5 @@ admin-dev/backups/
 admin-dev/export/
 admin-dev/import/
 download/
-img/
+/img/*
 upload/
diff --git a/options/gitignore/PureScript b/options/gitignore/PureScript
new file mode 100644
index 0000000000..361cf5277b
--- /dev/null
+++ b/options/gitignore/PureScript
@@ -0,0 +1,8 @@
+# Dependencies
+.psci_modules
+bower_components
+node_modules
+
+# Generated files
+.psci
+output
diff --git a/options/gitignore/Python b/options/gitignore/Python
index a65d04669c..62c1e73692 100644
--- a/options/gitignore/Python
+++ b/options/gitignore/Python
@@ -20,6 +20,7 @@ lib64/
 parts/
 sdist/
 var/
+wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -43,6 +44,7 @@ htmlcov/
 nosetests.xml
 coverage.xml
 *,cover
+.hypothesis/
 
 # Translations
 *.mo
@@ -50,9 +52,43 @@ coverage.xml
 
 # Django stuff:
 *.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
diff --git a/options/gitignore/Qt b/options/gitignore/Qt
index 85a6baace8..c7659c24f3 100644
--- a/options/gitignore/Qt
+++ b/options/gitignore/Qt
@@ -23,12 +23,16 @@ moc_*.cpp
 qrc_*.cpp
 ui_*.h
 Makefile*
-*-build-*
+*build-*
 
 # QtCreator
 
 *.autosave
 
-#QtCtreator Qml
+# QtCtreator Qml
 *.qmlproject.user
 *.qmlproject.user.*
+
+# QtCtreator CMake
+CMakeLists.txt.user*
+
diff --git a/options/gitignore/R b/options/gitignore/R
index 49037a0b7c..fcff087aeb 100644
--- a/options/gitignore/R
+++ b/options/gitignore/R
@@ -2,9 +2,18 @@
 .Rhistory
 .Rapp.history
 
+# Session Data files
+.RData
+
 # Example code in package build process
 *-Ex.R
 
+# Output files from R CMD build
+/*.tar.gz
+
+# Output files from R CMD check
+/*.Rcheck/
+
 # RStudio files
 .Rproj.user/
 
@@ -14,3 +23,11 @@ vignettes/*.pdf
 
 # OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
 .httr-oauth
+
+# knitr and R markdown default cache directories
+/*_cache/
+/cache/
+
+# Temporary files created by R markdown
+*.utf8.md
+*.knit.md
diff --git a/options/gitignore/Rails b/options/gitignore/Rails
index f786a90af3..e97427608c 100644
--- a/options/gitignore/Rails
+++ b/options/gitignore/Rails
@@ -12,15 +12,21 @@ capybara-*.html
 rerun.txt
 pickle-email-*.html
 
-# TODO Comment out these rules if you are OK with secrets being uploaded to the repo
+# TODO Comment out this rule if you are OK with secrets being uploaded to the repo
 config/initializers/secret_token.rb
-config/secrets.yml
 
-## Environment normalisation:
+# Only include if you have production secrets in this file, which is no longer a Rails default
+# config/secrets.yml
+
+# dotenv
+# TODO Comment out this rule if environment variables can be committed
+.env
+
+## Environment normalization:
 /.bundle
 /vendor/bundle
 
-# these should all be checked in to normalise the environment:
+# these should all be checked in to normalize the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
@@ -33,3 +39,6 @@ bower.json
 
 # Ignore pow environment settings
 .powenv
+
+# Ignore Byebug command history file.
+.byebug_history
diff --git a/options/gitignore/Ruby b/options/gitignore/Ruby
index 1ba91c05fe..5e1422c9c3 100644
--- a/options/gitignore/Ruby
+++ b/options/gitignore/Ruby
@@ -10,10 +10,24 @@
 /test/version_tmp/
 /tmp/
 
+# Used by dotenv library to load environment variables.
+# .env
+
 ## Specific to RubyMotion:
 .dat*
 .repl_history
 build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
 
 ## Documentation cache and generated files:
 /.yardoc/
@@ -21,7 +35,7 @@ build/
 /doc/
 /rdoc/
 
-## Environment normalisation:
+## Environment normalization:
 /.bundle/
 /vendor/bundle
 /lib/bundler/man/
diff --git a/options/gitignore/Rust b/options/gitignore/Rust
index 37727f91cb..50281a4427 100644
--- a/options/gitignore/Rust
+++ b/options/gitignore/Rust
@@ -1,11 +1,10 @@
-# Compiled files
-*.o
-*.so
-*.rlib
-*.dll
-
-# Executables
-*.exe
-
 # Generated by Cargo
+# will have compiled files and executables
 /target/
+
+# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
+# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
+Cargo.lock
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
diff --git a/options/gitignore/SBT b/options/gitignore/SBT
index 970d897c75..5ed6acb657 100644
--- a/options/gitignore/SBT
+++ b/options/gitignore/SBT
@@ -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/options/gitignore/Scala b/options/gitignore/Scala
index c58d83b318..9c07d4ae98 100644
--- a/options/gitignore/Scala
+++ b/options/gitignore/Scala
@@ -1,17 +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
diff --git a/options/gitignore/Scheme b/options/gitignore/Scheme
new file mode 100644
index 0000000000..cbb89d78da
--- /dev/null
+++ b/options/gitignore/Scheme
@@ -0,0 +1,7 @@
+*.ss~
+*.ss#*
+.#*.ss
+
+*.scm~
+*.scm#*
+.#*.scm
diff --git a/options/gitignore/Smalltalk b/options/gitignore/Smalltalk
new file mode 100644
index 0000000000..75272b2347
--- /dev/null
+++ b/options/gitignore/Smalltalk
@@ -0,0 +1,18 @@
+# changes file
+*.changes
+
+# system image
+*.image
+
+# Pharo Smalltalk Debug log file
+PharoDebug.log
+
+# Squeak Smalltalk Debug log file
+SqueakDebug.log
+
+# Monticello package cache
+/package-cache
+
+# Metacello-github cache
+/github-cache
+github-*.zip
diff --git a/options/gitignore/Stata b/options/gitignore/Stata
new file mode 100644
index 0000000000..07997bb120
--- /dev/null
+++ b/options/gitignore/Stata
@@ -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/options/gitignore/SublimeText b/options/gitignore/SublimeText
index 1d4e613759..95ff2244c9 100644
--- a/options/gitignore/SublimeText
+++ b/options/gitignore/SublimeText
@@ -12,3 +12,19 @@
 
 # sftp configuration file
 sftp-config.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings
diff --git a/options/gitignore/SugarCRM b/options/gitignore/SugarCRM
index 842c3ec518..e9270205fd 100644
--- a/options/gitignore/SugarCRM
+++ b/options/gitignore/SugarCRM
@@ -7,6 +7,7 @@
 # For development the cache directory can be safely ignored and
 # therefore it is ignored.
 /cache/
+!/cache/index.html
 # Ignore some files and directories from the custom directory.
 /custom/history/
 /custom/modulebuilder/
@@ -22,4 +23,5 @@
 *.log
 # Ignore the new upload directories.
 /upload/
+!/upload/index.html
 /upload_backup/
diff --git a/options/gitignore/Swift b/options/gitignore/Swift
index d571cb2c8d..d534044939 100644
--- a/options/gitignore/Swift
+++ b/options/gitignore/Swift
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,23 +15,35 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
 *.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
 *.ipa
+*.dSYM.zip
+*.dSYM
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+# Package.pins
+.build/
 
 # CocoaPods
 #
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
-# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
 # Pods/
 
@@ -41,3 +53,15 @@ xcuserdata
 # Carthage/Checkouts
 
 Carthage/Build
+
+# fastlane
+#
+# 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://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
diff --git a/options/gitignore/Symfony b/options/gitignore/Symfony
index c68377d1ac..6c224e024e 100644
--- a/options/gitignore/Symfony
+++ b/options/gitignore/Symfony
@@ -4,11 +4,16 @@
 !app/cache/.gitkeep
 !app/logs/.gitkeep
 
-# Cache and logs (Symfony3)
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
 /var/cache/*
 /var/logs/*
+/var/sessions/*
 !var/cache/.gitkeep
 !var/logs/.gitkeep
+!var/sessions/.gitkeep
 
 # Parameters
 /app/config/parameters.yml
@@ -20,7 +25,6 @@
 /bin/*
 !bin/console
 !bin/symfony_requirements
-/vendor/
 
 # Assets and user uploads
 /web/bundles/
@@ -33,5 +37,5 @@
 # Build data
 /build/
 
-# Composer PHAR
-/composer.phar
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
diff --git a/options/gitignore/Tags b/options/gitignore/Tags
index 45922ec1cb..91927af4cd 100644
--- a/options/gitignore/Tags
+++ b/options/gitignore/Tags
@@ -1,12 +1,15 @@
 # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
 TAGS
+.TAGS
 !TAGS/
 tags
+.tags
 !tags/
 gtags.files
 GTAGS
 GRTAGS
 GPATH
+GSYMS
 cscope.files
 cscope.out
 cscope.in.out
diff --git a/options/gitignore/TeX b/options/gitignore/TeX
index a7a84bc9e2..57ed9f5d97 100644
--- a/options/gitignore/TeX
+++ b/options/gitignore/TeX
@@ -6,6 +6,10 @@
 *.fls
 *.out
 *.toc
+*.fmt
+*.fot
+*.cb
+*.cb2
 
 ## Intermediate documents:
 *.dvi
@@ -15,25 +19,26 @@
 # *.eps
 # *.pdf
 
+## Generated if empty string is given at "Please type another file name for output:"
+.pdf
+
 ## Bibliography auxiliary files (bibtex/biblatex/biber):
 *.bbl
 *.bcf
 *.blg
 *-blx.aux
 *-blx.bib
-*.brf
 *.run.xml
 
 ## Build tool auxiliary files:
 *.fdb_latexmk
 *.synctex
+*.synctex(busy)
 *.synctex.gz
 *.synctex.gz(busy)
 *.pdfsync
 
 ## Auxiliary and intermediate files from other packages:
-
-
 # algorithms
 *.alg
 *.loa
@@ -46,11 +51,35 @@ acs-*.bib
 
 # beamer
 *.nav
+*.pre
 *.snm
 *.vrb
 
-#(e)ledmac/(e)ledpar
+# changes
+*.soc
+
+# cprotect
+*.cpt
+
+# elsarticle (documentclass of Elsevier journals)
+*.spl
+
+# endnotes
+*.ent
+
+# fixme
+*.lox
+
+# feynmf/feynmp
+*.mf
+*.mp
+*.t[1-9]
+*.t[1-9][0-9]
+*.tfm
+
+#(r)(e)ledmac/(r)(e)ledpar
 *.end
+*.?end
 *.[1-9]
 *.[1-9][0-9]
 *.[1-9][0-9][0-9]
@@ -70,15 +99,21 @@ acs-*.bib
 *.glg
 *.glo
 *.gls
+*.glsdefs
 
 # gnuplottex
 *-gnuplottex-*
 
+# gregoriotex
+*.gaux
+*.gtex
+
 # hyperref
 *.brf
 
 # knitr
 *-concordance.tex
+# TODO Comment the next line if you want to keep your tikz graphics files
 *.tikz
 *-tikzDictionary
 
@@ -93,9 +128,12 @@ acs-*.bib
 
 # minitoc
 *.maf
-*.mtc
-*.mtc[0-9]
-*.mtc[1-9][0-9]
+*.mlf
+*.mlt
+*.mtc[0-9]*
+*.slf[0-9]*
+*.slt[0-9]*
+*.stc[0-9]*
 
 # minted
 _minted*
@@ -104,22 +142,36 @@ _minted*
 # morewrites
 *.mw
 
-# mylatexformat
-*.fmt
-
 # nomencl
 *.nlo
 
+# pax
+*.pax
+
 # sagetex
 *.sagetex.sage
 *.sagetex.py
 *.sagetex.scmd
 
+# scrwfile
+*.wrt
+
 # sympy
 *.sout
 *.sympy
 sympy-plots-for-*.tex/
 
+# pdfcomment
+*.upa
+*.upb
+
+# pythontex
+*.pytxcode
+pythontex-files-*/
+
+# thmtools
+*.loe
+
 # TikZ & PGF
 *.dpth
 *.md5
@@ -128,9 +180,38 @@ sympy-plots-for-*.tex/
 # todonotes
 *.tdo
 
+# easy-todo
+*.lod
+
 # xindy
 *.xdy
 
+# xypic precompiled matrices
+*.xyc
+
+# endfloat
+*.ttt
+*.fff
+
+# Latexian
+TSWLatexianTemp*
+
+## Editors:
 # WinEdt
 *.bak
 *.sav
+
+# Texpad
+.texpadtmp
+
+# Kile
+*.backup
+
+# KBibTeX
+*~[0-9]*
+
+# auto folder when using emacs and auctex
+/auto/*
+
+# expex forward references with \gathertags
+*-tags.tex
diff --git a/options/gitignore/Terraform b/options/gitignore/Terraform
new file mode 100644
index 0000000000..41859c81f1
--- /dev/null
+++ b/options/gitignore/Terraform
@@ -0,0 +1,6 @@
+# Compiled files
+*.tfstate
+*.tfstate.backup
+
+# Module directory
+.terraform/
diff --git a/options/gitignore/Typo3 b/options/gitignore/Typo3
index 5781fcc3cb..cb024fefe9 100644
--- a/options/gitignore/Typo3
+++ b/options/gitignore/Typo3
@@ -1,5 +1,5 @@
 ## TYPO3 v6.2
-# Ignore serveral upload and file directories.
+# Ignore several upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/_temp_/
 /fileadmin/_processed_/
diff --git a/options/gitignore/Umbraco b/options/gitignore/Umbraco
index 21af92de7a..ea05e1fb2a 100644
--- a/options/gitignore/Umbraco
+++ b/options/gitignore/Umbraco
@@ -1,12 +1,11 @@
 # Note: VisualStudio gitignore rules may also be relevant
 
+# Umbraco
 # Ignore unimportant folders generated by Umbraco
-**/App_Data/ClientDependency/
-**/App_Data/ExamineIndexes/
 **/App_Data/Logs/
 **/App_Data/[Pp]review/
 **/App_Data/TEMP/
-Cached/
+**/App_Data/NuGetBackup/
 
 # Ignore Umbraco content cache file
 **/App_Data/umbraco.config
@@ -15,3 +14,6 @@ Cached/
 # Make sure to include details from VisualStudio.gitignore BEFORE this
 !**/App_Data/[Pp]ackages/
 !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
+
+# ImageProcessor DiskCache 
+**/App_Data/cache/
diff --git a/options/gitignore/Unity b/options/gitignore/Unity
index 9de94098c4..eb83a8f122 100644
--- a/options/gitignore/Unity
+++ b/options/gitignore/Unity
@@ -2,8 +2,15 @@
 /[Tt]emp/
 /[Oo]bj/
 /[Bb]uild/
+/[Bb]uilds/
+/Assets/AssetStoreTools*
 
-# Autogenerated VS/MD solution and project files
+# Visual Studio 2015 cache directory
+/.vs/
+
+# Autogenerated VS/MD/Consulo solution and project files
+ExportedObj/
+.consulo/
 *.csproj
 *.unityproj
 *.sln
@@ -13,9 +20,15 @@
 *.userprefs
 *.pidb
 *.booproj
+*.svd
+*.pdb
 
 # Unity3D generated meta files
 *.pidb.meta
 
 # Unity3D Generated File On Crash Reports
 sysinfo.txt
+
+# Builds
+*.apk
+*.unitypackage
diff --git a/options/gitignore/UnrealEngine b/options/gitignore/UnrealEngine
new file mode 100644
index 0000000000..2f096001fe
--- /dev/null
+++ b/options/gitignore/UnrealEngine
@@ -0,0 +1,70 @@
+# Visual Studio 2015 user specific files
+.vs/
+
+# Visual Studio 2015 database file
+*.VC.db
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+*.ipa
+
+# These project files can be generated by the engine
+*.xcodeproj
+*.xcworkspace
+*.sln
+*.suo
+*.opensdf
+*.sdf
+*.VC.db
+*.VC.opendb
+
+# Precompiled Assets
+SourceArt/**/*.png
+SourceArt/**/*.tga
+
+# Binary Files
+Binaries/*
+
+# Builds
+Build/*
+
+# Don't ignore icon files in Build
+!Build/**/*.ico
+
+# Built data for maps
+*_BuiltData.uasset
+
+# Configuration files generated by the Editor
+Saved/*
+
+# Compiled source files for the engine to use
+Intermediate/*
+
+# Cache files for the editor to use
+DerivedDataCache/*
diff --git a/options/gitignore/Vim b/options/gitignore/Vim
index 6c5ee8df16..42e7afc100 100644
--- a/options/gitignore/Vim
+++ b/options/gitignore/Vim
@@ -1,6 +1,12 @@
-[._]*.s[a-w][a-z]
-[._]s[a-w][a-z]
-*.un~
+# swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-v][a-z]
+[._]sw[a-p]
+# session
 Session.vim
+# temporary
 .netrwhist
 *~
+# auto-generated tag files
+tags
diff --git a/options/gitignore/VirtualEnv b/options/gitignore/VirtualEnv
index 831cf3afcf..b2c22f2af7 100644
--- a/options/gitignore/VirtualEnv
+++ b/options/gitignore/VirtualEnv
@@ -4,7 +4,9 @@
 [Bb]in
 [Ii]nclude
 [Ll]ib
+[Ll]ib64
 [Ll]ocal
 [Ss]cripts
 pyvenv.cfg
+.venv
 pip-selfcheck.json
diff --git a/options/gitignore/VisualStudio b/options/gitignore/VisualStudio
index 150691aa0f..a752eacca7 100644
--- a/options/gitignore/VisualStudio
+++ b/options/gitignore/VisualStudio
@@ -1,5 +1,7 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -17,10 +19,10 @@
 [Rr]eleases/
 x64/
 x86/
-build/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -40,9 +42,11 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# DNX
+# .NET Core
 project.lock.json
+project.fragment.lock.json
 artifacts/
+**/Properties/launchSettings.json
 
 *_i.c
 *_p.c
@@ -76,9 +80,12 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
@@ -106,6 +113,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -137,11 +148,16 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
@@ -150,13 +166,23 @@ publish/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
 
-# Windows Azure Build Output
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
-# Windows Store app package directory
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -166,16 +192,19 @@ AppPackages/
 
 # Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.publishsettings
-node_modules/
 orleans.codegen.cs
 
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -199,8 +228,15 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
+node_modules/
+
+# Typescript v1 declaration files
+typings/
 
 # Visual Studio 6 build log
 *.plg
@@ -208,6 +244,9 @@ FakesAssemblies/
 # Visual Studio 6 workspace options file
 *.opt
 
+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+*.vbw
+
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -215,3 +254,34 @@ FakesAssemblies/
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Cake - Uncomment if you are using it
+# tools/**
+# !tools/packages.config
+
+# Telerik's JustMock configuration file
+*.jmconfig
+
+# BizTalk build output
+*.btp.cs
+*.btm.cs
+*.odx.cs
+*.xsd.cs
\ No newline at end of file
diff --git a/options/gitignore/VisualStudioCode b/options/gitignore/VisualStudioCode
index 0865bb7d3e..0511e2b51f 100644
--- a/options/gitignore/VisualStudioCode
+++ b/options/gitignore/VisualStudioCode
@@ -1,2 +1,5 @@
-.settings
-
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
diff --git a/options/gitignore/Waf b/options/gitignore/Waf
index 68cacdb973..dad2b56bdd 100644
--- a/options/gitignore/Waf
+++ b/options/gitignore/Waf
@@ -1,3 +1,9 @@
-# for projects that use Waf for building: http://code.google.com/p/waf/
-.waf-*
-.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
diff --git a/options/gitignore/Windows b/options/gitignore/Windows
index a0d31452b0..ba26afd965 100644
--- a/options/gitignore/Windows
+++ b/options/gitignore/Windows
@@ -1,6 +1,7 @@
-# Windows image file caches
+# Windows thumbnail cache files
 Thumbs.db
 ehthumbs.db
+ehthumbs_vista.db
 
 # Folder config file
 Desktop.ini
diff --git a/options/gitignore/WordPress b/options/gitignore/WordPress
index 5603287880..97923503c4 100644
--- a/options/gitignore/WordPress
+++ b/options/gitignore/WordPress
@@ -1,7 +1,4 @@
 *.log
-.htaccess
-sitemap.xml
-sitemap.xml.gz
 wp-config.php
 wp-content/advanced-cache.php
 wp-content/backup-db/
@@ -13,6 +10,9 @@ wp-content/uploads/
 wp-content/wp-cache-config.php
 wp-content/plugins/hello.php
 
-/readme.html
+/.htaccess
 /license.txt
+/readme.html
+/sitemap.xml
+/sitemap.xml.gz
 
diff --git a/options/gitignore/Xcode b/options/gitignore/Xcode
index d07b7894f1..37de8bb479 100644
--- a/options/gitignore/Xcode
+++ b/options/gitignore/Xcode
@@ -4,7 +4,7 @@
 
 ## Build generated
 build/
-DerivedData
+DerivedData/
 
 ## Various settings
 *.pbxuser
@@ -15,9 +15,9 @@ DerivedData
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata
+xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
-*.xcuserstate
+*.xccheckout
+*.xcscmblueprint
diff --git a/options/gitignore/XilinxISE b/options/gitignore/XilinxISE
index e041f51b2d..4475f843da 100644
--- a/options/gitignore/XilinxISE
+++ b/options/gitignore/XilinxISE
@@ -42,6 +42,16 @@
 *_usage.xml
 *_xst.xrpt
 
+# iMPACT generated files
+_impactbatch.log
+impact.xsl
+impact_impact.xwbt
+ise_impact.cmd
+webtalk_impact.xml
+
+# Core Generator generated files
+xaw2verilog.log
+
 # project-wide generated files
 *.gise
 par_usage_statistics.html
diff --git a/options/gitignore/ZendFramework b/options/gitignore/ZendFramework
index 3fbc97334c..80adb15490 100644
--- a/options/gitignore/ZendFramework
+++ b/options/gitignore/ZendFramework
@@ -15,6 +15,11 @@ data/sessions/
 data/tmp/
 temp/
 
+#Doctrine 2
+data/DoctrineORMModule/Proxy/
+data/DoctrineORMModule/cache/
+
+
 # Legacy ZF1
 demos/
 extras/documentation
diff --git a/options/gitignore/macOS b/options/gitignore/macOS
index 660b31353e..f0f3fbc06c 100644
--- a/options/gitignore/macOS
+++ b/options/gitignore/macOS
@@ -1,24 +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
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+*.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/scripts/generate-gitignores.go b/scripts/generate-gitignores.go
new file mode 100644
index 0000000000..471152c907
--- /dev/null
+++ b/scripts/generate-gitignores.go
@@ -0,0 +1,96 @@
+// +build !build
+
+package main
+
+import (
+	"archive/tar"
+	"compress/gzip"
+	"flag"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"net/http"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+var (
+	prefix      = "gitea-gitignore"
+	url         = "https://api.github.com/repos/github/gitignore/tarball"
+	destination = ""
+)
+
+func init() {
+	flag.StringVar(&destination, "dest", "options/gitignore/", "destination for the gitignores")
+}
+
+func main() {
+	flag.Parse()
+
+	file, err := ioutil.TempFile(os.TempDir(), prefix)
+
+	if err != nil {
+		log.Fatalf("Failed to create temp file. %s", err)
+	}
+
+	defer os.Remove(file.Name())
+
+	resp, err := http.Get(url)
+
+	if err != nil {
+		log.Fatalf("Failed to download archive. %s", err)
+	}
+
+	defer resp.Body.Close()
+
+	if _, err := io.Copy(file, resp.Body); err != nil {
+		log.Fatalf("Failed to copy archive to file. %s", err)
+	}
+
+	if _, err := file.Seek(0, 0); err != nil {
+		log.Fatalf("Failed to reset seek on archive. %s", err)
+	}
+
+	gz, err := gzip.NewReader(file)
+
+	if err != nil {
+		log.Fatalf("Failed to gunzip the archive. %s", err)
+	}
+
+	tr := tar.NewReader(gz)
+
+	for {
+		hdr, err := tr.Next()
+
+		if err == io.EOF {
+			break
+		}
+
+		if err != nil {
+			log.Fatalf("Failed to iterate archive. %s", err)
+		}
+
+		if filepath.Ext(hdr.Name) != ".gitignore" {
+			continue
+		}
+
+		out, err := os.Create(path.Join(destination, strings.TrimSuffix(filepath.Base(hdr.Name), ".gitignore")))
+
+		if err != nil {
+			log.Fatalf("Failed to create new file. %s", err)
+		}
+
+		defer out.Close()
+
+		if _, err := io.Copy(out, tr); err != nil {
+			log.Fatalf("Failed to write new file. %s", err)
+		} else {
+			fmt.Printf("Written %s\n", out.Name())
+		}
+	}
+
+	fmt.Println("Done")
+}