* upstream/master:
  These should go into other gitignores, like Vim.gitignore
  Added Wordpress (Forgot to 'git add .')
  Added Vim >= 7.3 persistent undo files
  Added few files to OSX.gitignore

Conflicts:
	Global/OSX.gitignore

Ignore files generated by OS X that might appear on external disks:
  .Spotlight-V100
  .Trashes

* upstream/master:
  added rerun and config ignores
  Add Haskell gitignore
  Added ExpressionEngine gitignore file.
  Fixed comment in Objective-C.gitignore
  Fixed comments in C++.gitignore
  Fixed comments in Archives.gitignore
  Fixed comment in Linux.gitignore file
  Small cleanup of comments in the file

Hopefully comments look better now.

Ignore files generated by OS X that might appear on external disks:
  .Spotlight-V100
  .Trashes

Hopefully comments look better now.

Improved CodeIgniter .gitignore to support an system directory in a different location to the default install. Fixed database.php ignore rule. The application directory can be moved to any location and the ignore will still operate

Removing:
- static/uploaded/**/* since there is no default
  for upload paths (configurable)
- *.mo because it's a best practice to keep them
  close to the po files and update before release
- *.pyc since that's covered by the Python gitignore file

Adding:
- local_settings.py because it's a best practice
  for Django projects (next to settings.py)

According to current man pages of git-config there is no = to set
the config value.