Update Travis

Updated .travis.yml and tox.ini to test both Python 2 and Python 3.
Fix Conflict