Merge pull request #51 from phansch/master

Testing pull request from fork

closes #50
Fix database
Add new env vars to travis config
Add fallback database name

This is probably required for external pull requests
Remove unused environment variables
Test external pull request again