First pass at loading data into the db schema
Merge remote-tracking branch 'origin/master'