Merge changes I8c087cc5,I62da9821

* changes:
  Remove test.ini when done with it during tests
  Ignore vim swap files
diff --git a/.gitignore b/.gitignore
index c8d2560..83c5419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 proto
 *~
+.*.sw[nop]
 *.log
 src
 localrc
diff --git a/tests/functions.sh b/tests/functions.sh
index e7fbe0c..e436ed9 100755
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -141,3 +141,5 @@
 else
     echo "inicomment failed: $VAL"
 fi
+
+rm test.ini