diff --git a/.gitignore b/.gitignore
index 60866848..6c03ec1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,11 @@ nosetests.xml
 
 #bfgs optimiser leaves this lying around
 iterate.dat
+
+# Nosetests #
+#############
+*.noseids
+
+# git merge files #
+###################
+*.orig
\ No newline at end of file