Merge pull request #185 from jplock/jp-ignore-carddav-db-errors

Ignore carddav database errors
Merge pull request #186 from jplock/jp-roundcube-fixes

Properly generate a PHP /etc/roundcube/debian-db.php file
Merge branch 'master' of https://github.com/al3x/sovereign