Hopefully modifying data files to bring the two branches into sync.
These changes should bring the master branch inline with dans_branch as of October, 24 and resolve the merge conflicts.