Merge .travis.yml from testing to development