diff --git a/.gitignore b/.gitignore
index 228c2f5e8..a6c262c0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,18 +10,18 @@
 # Ignore the default SQLite database.
 /db/*.sqlite3
 
+# Ignore local changes to schema.rb (e. g. through extentions)
+/db/schema.rb
+
 # Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp/websocket*
-/tmp/cache*
-/tmp/pids/*
-/tmp/*.png
+/log
+/tmp
 /public/assets/*.*
-/public/assets/app/*
-/public/assets/custom/*
+/public/assets/app
+/public/assets/custom
 
 # Ignore custom gem file
-Gemfile.local
+/Gemfile.local
 
 # Ignore .project files
 /.project
@@ -36,10 +36,7 @@ Gemfile.local
 .*.swp
 
 # Ignore coverage stuff
-/coverage/*
-
-# Ignore local changes to schema.rb (e. g. through extentions)
-db/schema.rb
+/coverage
 
 # Ignore Rubymine config
 /.idea
diff --git a/tmp/README b/tmp/README
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tmp/pids/README b/tmp/pids/README
deleted file mode 100644
index e69de29bb..000000000