tox
fix on py3
Merge pull request #2 from ashleyh/master

Python 3 support