a pile of local changes
Merge branch 'master' of github.com:OregonDigital/cdm2bag