Merge pull request #702 from bhariharan/smart_sync

First stab at adding MetadataManager