Fixes setup.py to properly upload to PyPi, also fixes dependency issue for Travis.