Revert "Revert "Simplify connecting to the database in Catalyst""
Revert "Revert "Simplify connecting to the database in Catalyst""

This reverts commit 8a525f37d8a01ec172ab4d465b04896d238799e5.

berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud,berkmancenter/mediacloud