Merge "Have tox install via setup.py develop"

tox.ini

@@ -1,18 +1,21 @@
 [tox]
+minversion = 1.6
 envlist = py26,py27,py33,pep8
+skipsdist = True
 
 [testenv]
 sitepackages = True
+usedevelop = True
+install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          LANG=en_US.UTF-8
          LANGUAGE=en_US:en
          LC_ALL=C
-deps = -U
-       -r{toxinidir}/requirements.txt
+deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 commands =
   python tools/patch_tox_venv.py
-  python setup.py testr --slowest --testr-args='{posargs}'
+  python setup.py test --slowest --testr-args='{posargs}'
 
 [tox:jenkins]
 sitepackages = True