diff --git a/.gitignore b/.gitignore
index 2800e844..ef27bf66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,22 @@
-*.pyc
-terminatorlib/*.pyc
+## Editors
+*~
+.*.sw[op]
 .project
+.idea
 .pydevproject
-terminatorlib/meliae
-_trial_temp
+
+## VCS
+/.bzr
+
+## Python
+*.pyc
+*.egg-info
+/build
 terminatorc
+remotinatorc
+terminatorlib/meliae
+
+## language / intltool related files
+.intltool*
+data/terminator.appdata.xml
+data/terminator.desktop