Merge pull request #157 from erickt/save2

Clients should locally save metadata