Clean up requirements a bit
Another travis fix attempt