Add Exception for htaccess file denying access to the cache folder
add media/catalog/product/cache/ to magento ignore
Move .htaccess to its place under core files, not text files
Update Magento.gitignore

The line for `install.php` blocks adding *any* file with that name. In this instance, it caused Git to ignore a file for the Aitoc_Aitsys module located at: `app/code/local/Aitoc/Aitsys/Model/Module/Install.php`
add .idea_modules/

https://github.com/mpeltonen/sbt-idea generates this folder
Ignore multiple vim swapfiles

In case there is more than one swapfile for a file (.swo, .swn, ...)
Merge branch 'master' of https://github.com/github/gitignore
Merge pull request #391 from mastacheata/patch-1

Add Exception for htaccess file denying access to the cache folder
Merge pull request #597 from TomLiu/master

Ignore magento product image cache
Merge pull request #688 from leek/patch-1

Update Magento.gitignore to tighten the pattern for install.php
Remove patterns covered by other templates

Remove redundant patterns, and patterns for generic backups, version
control dirs, IDEs, OSX.
Merge pull request #629 from ChinggizKhan/minor-drupal-gitignore-issue

Correct minor ordering issue on Drupal gitignore
Covered by global vim template
Merge pull request #839 from jean/master

Clean up the plone template
merge upstream/master
add .idea_modules/ to Global/JetBrains.gitignore
Merge pull request #784 from yatskevich/master

Add .idea_modules/ to Global/JetBrains.gitignore (from sbt-idea plugin)