Update metadata handling to be consistent with Compute
Merged in pull containing the schedule metadata update fix
Merge pull request #56 from esheffield/metadata_new

Update metadata handling to be consistent with Compute