fixed tox.ini so that tox works
made requests==2.2.1 rather than a >=
Merge remote-tracking branch 'origin/toxfix' into pyapi. This brings in
the correct requirements.txt for pyapi to use, and leaves just one branch for
review
all tests pass for py2.6 and 2.7.