Merge remote branch 'upstream/master'

* 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