Merge pull request #1 from rodis/master

Clean up the tox and travis configuration