Salt Lake merged (no tests due to OpenOffice), iTree complete
First pass at everything loaded, undoubtably something missing
Before merger
Before merger; backup of old make_database for later manual corrections
Merging into ESA, since ESA has now become the best branch