foo.diff

diff --git a/.gitignore b/.gitignore
index f8f1975..0d50f56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,5 +14,3 @@
 /setup.log
 /setup.ml
 META
-*.swp
-*.merlin
diff --git a/.merlin b/.merlin
index ee42aa1..14b9427 100644
--- a/.merlin
+++ b/.merlin
@@ -14,5 +14,3 @@ S lib/bap_dwarf
 S lib/bap_elf
 S lib/bap_image
 S lib/bap_types
-B /home/rvt/ounit-2.0.0/_build/src
-S /home/rvt/ounit-2.0.0/src 
diff --git a/_tags.in b/_tags.in
index b414d60..1dedc5c 100644
--- a/_tags.in
+++ b/_tags.in
@@ -1,2 +1 @@
 true: short_paths
-true: annot, bin_annot