Fix travis

Fix a bunch of Travis problems that should've been caught and fixed earlier.