Switch to new-style metadata
Merge pull request #10 from jpmckinney/metadata

Switch to new-style metadata