I added some database stuff
Merge remote-tracking branch 'origin/master'
I (mostly) fixed the ingestors.