merged travis config and update to database.yml