Fixed conflicts with jbalogh's commit involving setup.py.

addon-validator

@@ -0,0 +1,5 @@
+import validator.main
+
+
+if __name__ == '__main__':
+    validator.main.main()

setup.py

@@ -22,7 +22,7 @@ setup(
                       'coverage',
                       'Fabric',
                       'argparse'],
-    scripts=["validator/validator.py"],
+    scripts=["addon-validator"],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',