Minor tool fixes

tools/merge_libs

@@ -185,7 +185,7 @@ class FootPrint:
 
     def merge(self, path):
         for p in os.listdir(path):
-            m = re.match('^(.*).kicad_mod', p)
+            m = re.match('^(.*).kicad_mod$', p)
             if not m:
                 continue
             name = m.group(1)
@@ -260,7 +260,7 @@ if __name__ == '__main__':
                     pass
                 pass
             if not ok:
-                print("No match for '%s(%s)' in '%s'" %
+                print("No footprint for '%s(%s)' in '%s'" %
                       (k, p, lib.defined[k]), file=sys.stderr)
                 pass
             pass