Changes to testing stuff
* simplified tox config
* added python 3 to travis config
Merge pull request #115 from ondrowan/testing_stuff

Changes to testing stuff