Update for a directory name change

Also a few other unrelated bro to zeek renaming changes.

setup.py

@@ -21,12 +21,12 @@
 
 setup(name="pysubnettree",
     version="0.30", # Filled in automatically.
-    maintainer="The Bro Project",
-    maintainer_email="info@bro.org",
+    maintainer="The Zeek Project",
+    maintainer_email="info@zeek.org",
     license="BSD",
     description=description,
     py_modules=['SubnetTree'],
-    url="http://www.bro.org/sphinx/components/pysubnettree/README.html",
+    url="http://www.zeek.org/sphinx/components/pysubnettree/README.html",
     ext_modules = [
         Extension("_SubnetTree",
             sources=["SubnetTree.cc", "patricia.c", "SubnetTree_wrap.cc"],

testing/btest.cfg

@@ -6,6 +6,6 @@ IgnoreDirs  = .svn CVS .tmp
 IgnoreFiles = *.tmp *.swp #* *.trace .DS_Store
 
 [environment]
-PYTHONPATH=%(testbase)s/../../../../../build/aux/broctl/aux/pysubnettree:%(testbase)s/Scripts
+PYTHONPATH=%(testbase)s/../../../../../build/aux/zeekctl/aux/pysubnettree:%(testbase)s/Scripts
 PATH=%(testbase)s/../../../../btest:%(default_path)s
 TMPDIR=%(testbase)s/.tmp