Still trying to fix travis dependencies, some updates to setup.py.