Updated .travis.yml
Updated setup.py and .travis.yml