Fixed up tests for 2.7.5+ and added tox support
Merge pull request #37 from SandyWalsh/tox_support

Fixed up tests for 2.7.5+ and added tox support