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

ExpressionEngine.gitignore

@@ -0,0 +1,15 @@
+.DS_Store
+
+# Images
+images/avatars/
+images/captchas/
+images/smileys/
+images/member_photos/
+images/signature_attachments/
+images/pm_attachments/
+
+# Caches
+sized/
+thumbs/
+_thumbs/
+*/expressionengine/cache/*

Haskell.gitignore

@@ -0,0 +1,3 @@
+dist
+*.o
+*.hi

Rails.gitignore

@@ -12,3 +12,5 @@ capybara-*.html
 /coverage/
 /spec/tmp/*
 **.orig
+config/*.yml
+rerun.txt