update ingest and server code (mweston)
Merge branch 'master' of https://github.com/shrander/bda