Fix .travis.yml by removing old merge conflict crap, add new data