Merge pull request #1245 from timw4mail/patch

Make database config easier to work with