More travis-related updates
More fixes for travis; all tests should now pass