Add DB associations
Revert to 7c7ec0e76
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into pganson_db