Another Heroku db fix
Added nested associations and cleaned up a few things