Working out python versions
Code cleanup and new tests, updated .travis.yml