Fix for Python2.6
Use tox for local testing
More tests
Merge pull request #47 from lepture/python2.6

Fix for Python2.6