merged latest from develop

ns3/corens3/__init__.py

@@ -4,6 +4,6 @@ corens3
 Python package containing CORE components for use
 with the ns-3 simulator.
 
-See http://www.nrl.navy.mil/itd/ncs/products/core and
-http://code.google.com/p/coreemu/ for more information on CORE.
+See http://code.google.com/p/coreemu/ 
+for more information on CORE.
 """

ns3/setup.py.in

@@ -14,7 +14,6 @@ setup(
     description="Python ns-3 components of CORE",
     url="https://github.com/coreemu/core",
     author="Boeing Research & Technology",
-    author_email="core-dev@nrl.navy.mil",
     license="GPLv2",
     long_description="Python scripts and modules for building virtual simulated networks."
 )