Merge with minor fixes.
Merge branch 'develop' of https://github.com/emory-libraries/voyages into develop