6412ed01

By: Michael Lynch <git@mtlynch.io>

Merge master into delete-media/3/delete-files

Resolve the metadata store naming conflict in favor of MetadataStore and metadataStore.