Fixed database.yml
Merge branch 'travis'
Removed database.yml
Fixed database setup for travis