Pull DATABASE_URL from ENV as well as .env and .env.test
Only use DATABASE_URL when available
Merge pull request #69 from 12-oz/brandur-env-database-url

Pull DATABASE_URL from ENV as well as .env and .env.test