WIP: Fix DB disconnects #204

Closed
trentlarson wants to merge 0 commits from clean-db-disconnects into master