Updated code for new method of loading data (via loadData() function). Load merged data from the "merged" directory instead of individual data sources' directories (in preparation for automatic data merging across all data sources). Code cleanup.