adds database.yml and .travis.yml travis config
solves merge conflicts