Conflicts:
	Python.gitignore

Add spool folder to Symfony

No need to push .spyderproject file in a python project

KiCAD: ignore more temp files and generated data

Update CakePHP.gitignore

Add the other Dreamweaver added files

Fixes for Magento

Added doctrine 2 orm default cache and proxy locations

Update cache files in Prestashop.gitignore

WordPress: Only ignore files in root to support other plugins

Ignore output from R CMD build and R CMD check

Added .htaccess to concrete5 gitignore

Add Scheme.gitignore

Add Smalltalk gitignore

Update CVS.gitignore

Add scrapy stuff to .gitignore

Update FuelPHP.gitignore

Added Eclipse Recommenders to Eclipse gitignore

add .projectile file to emacs .gitignore

Add Dropbox.gitignore

Remove ApplicationInsights.config from VisualStudio.gitignore

Commit a25589c9 introduced an ignore line for ApplicationInsights.config. This change breaks builds on certain systems, namely VSTS.

The current ASP.NET 4 template adds ApplicationInsights.config to the project's .csproj file. When VSTS attempts to build the project, it will fail if it cannot find ApplicationInsights.config.

ApplicationInsights.config is a required application file and should not be ignored.

added dotenv to python gitignore

adding terraform state files

adding a template to help streamline review process

Removed xccheckout and xcscmblueprint from Swift/Objc/Xcode

# Conflicts:
#	Objective-C.gitignore
#	Swift.gitignore

Update Vim.gitignore

Update Jetbrains .gitignore dataSources.local.xml

Add *.glsdefs to TeX.gitignore

removed elm-package.json

elm-package.json lists dependencies, so it shouldn't be ignored