Use convention-based db stuff
Merge pull request #1 from jreynolds-daptiv/cleanup-db-joins

Use convention-based db stuff