Updated for gimili to build from the develop branch.
Merge branch 'develop' of https://github.com/ucsdlib/damspas.git into develop