adds travis db settings and therefore needs to change .gitignore
Merge branch 'working'