changed pypi namespace to include dash, updated docs

Author: cgoldberg

docs/index.rst

@@ -13,9 +13,9 @@
 
 ----
 
-:Home: http://testutils.org/multimechanize
+:Home: http://multimechanize.com
 :Dev: http://github.com/cgoldberg/multi-mechanize
-:PyPI: http://pypi.python.org/pypi/multimechanize
+:PyPI: http://pypi.python.org/pypi/multi-mechanize
 :License: GNU LGPLv3
 :Author: Copyright (c) 2010-2012 Corey Goldberg
 
@@ -36,11 +36,11 @@ for compatibility with CI systems.
     Install / Setup
 -------------------
 
-Multi-Mechanize can be installed from `PyPI <http://pypi.python.org/pypi/multimechanize>`_ using `pip <http://www.pip-installer.org>`_::
+Multi-Mechanize can be installed from `PyPI <http://pypi.python.org/pypi/multi-mechanize>`_ using `pip <http://www.pip-installer.org>`_::
     
-    pip install -U multimechanize
+    pip install -U multi-mechanize
 
-... or download the `source distribution from PyPI <http://pypi.python.org/pypi/multimechanize#downloads>`_, unarchive, and run::
+... or download the `source distribution from PyPI <http://pypi.python.org/pypi/multi-mechanize#downloads>`_, unarchive, and run::
 
     python setup.py install
     

setup.py

@@ -21,20 +21,19 @@
 this_dir = os.path.abspath(os.path.dirname(__file__))
 
 
-NAME = 'multimechanize'
+NAME = 'multi-mechanize'
 VERSION = __version__
 PACKAGES = find_packages(exclude=['ez_setup'])
 DESCRIPTION = 'Multi-Mechanize - Performance Test Framework'
-URL = 'http://testutils.org/multimechanize'
+URL = 'http://multimechanize.com'
 LICENSE = 'GNU LGPLv3'
 LONG_DESCRIPTION = open(os.path.join(this_dir, 'README.rst')).read()
 REQUIREMENTS = filter(None, open(os.path.join(this_dir, 'requirements.txt')).read().splitlines())
 AUTHOR = 'Corey Goldberg'
 AUTHOR_EMAIL = 'corey@goldb.org'
-KEYWORDS = ('performance scalability load test testing benchmark').split(' ')
+KEYWORDS = ('performance', 'scalability', 'load', 'test', 'testing', 'benchmark')
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
-    'Environment :: Console',
     'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
     'Operating System :: OS Independent',
     'Programming Language :: Python',