Merge remote-tracking branch 'arsenm/patch-1'

Conflicts:
	C.gitignore
Merge pull request #304 from mgold/master

.netrwhist
Merge pull request #361 from MaxNanasy/patch-1

Removed redundant ".directory" that was already covered by ".*".
Make CakePHP ignore config folder of either case

This takes the change from #339 and makes it case insensitive so that CakePHP projects from both before and after the rename ignore the appropriate files.
Merge pull request #385 from gneatgeek/master

Updated SASS gitignore
Merge pull request #384 from thenew/patch-1

add *.log (wp-content/debug.log)
Merge pull request #401 from rb2/master

Fix Opencart gitignore
Merge pull request #399 from bfuk/patch-2

Added ignore of W3TC cache folder (for users that might be using W3TC ca...
Merge pull request #400 from NameFILIP/patch-1

Update SeamGen.gitignore
Merge pull request #395 from hugocf/patch-1

Windows XP Media Center Edition also creates ehthumbs.db
Merge pull request #392 from lmjabreu/patch-2

Added file exclusions, reformatted
Add .LSOverride
Android: Ignore the proguard folder

When exporting a signed .apk, Ecipse creates a proguard folder in the root directory. It should not be commited.
Remove space after Thumbs.db — fixes #355
Add objects and libraries on Windows
Add executables for C++
Adding pydev files
Added .gitignore entries for .vspx and .log
Added .vspx and .log to .gitignore for VB
Merge pull request #360 from svanschu/master

PHPStorm gitignore