Make 2.5 test runnable with tox
Merge pull request #139 from tkf/tox-25

Fix setup.py and make 2.5 test runnable with tox