Cluster Metadata Part 2 Rebased

Replaces #370. Rebased on develop since jrw-cluster-meta branch was merged. In addition, this PR adds a few things that were not included in #370. If they were mentioned in the original PR they are noted there.