diff --git a/.gitignore b/.gitignore
index c6127b3..d8f099d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,9 @@
+# Our stuff
+*.swp
+test
+bin/
+obj/
+
 # Prerequisites
 *.d
 
diff --git a/Makefile b/Makefile
index 83be3c0..6a93aac 100644
--- a/Makefile
+++ b/Makefile
@@ -12,5 +12,6 @@ install:
 	mkdir -p bin
 
 clean:
+	rm -rf test
 	rm -rf bin
 	rm -rf obj