* 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
* 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