Moved a few things around.

.gitignore

@@ -1,3 +1,7 @@
 *.swp
+*.komodoproject
 *.pyc
 *.egg-info/
+build
+dist
+results

mozwebqa/__init__.py

@@ -1,3 +0,0 @@
-__version__ = '0.9'
-
-from mozwebqa import *

pytest_mozwebqa.py

@@ -22,6 +22,8 @@ from selenium import webdriver
 import yaml
 
 
+__version__ = '0.9'
+
 def pytest_configure(config):
     if not hasattr(config, 'slaveinput'):
 

setup.py

@@ -1,21 +1,16 @@
 from setuptools import setup
 
-setup(
-    name = 'pytest-mozwebqa',
-    version = '0.9',
-    description='Mozilla WebQA plugin for py.test.',
-    author = 'Dave Hunt',
-    author_email = 'dhunt@mozilla.com',
-    install_requires = ['pytest>=2.2.3', 'selenium', 'pyyaml', 'requests'],
-    url = 'https://github.com/davehunt/pytest-mozwebqa',
-    packages = ['mozwebqa'],
-    # the following makes a plugin available to py.test
-    entry_points = {
-        'pytest11': [
-            'mozwebqa = mozwebqa.mozwebqa',
-        ]
-    },
-    classifiers = [
+setup(name='pytest-mozwebqa',
+      version='0.9',
+      description='Mozilla WebQA plugin for py.test.',
+      author='Dave Hunt',
+      author_email='dhunt@mozilla.com',
+      url='https://github.com/davehunt/pytest-mozwebqa',
+      install_requires=['pytest>=2.2.3', 'selenium', 'pyyaml', 'requests'],
+      entry_points={'pytest11': ['pytest_mozwebqa = pytest_mozwebqa']},
+      license='Mozilla Public License 2.0 (MPL 2.0)',
+      keywords='py.test pytest selenium saucelabs mozwebqa webqa qa mozilla',
+      classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)',
@@ -26,5 +21,5 @@ setup(
         'Topic :: Software Development :: Testing',
         'Topic :: Utilities',
         'Programming Language :: Python',
-    ]
-)
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7'])