Updates to travis and setup.py