refactor; add save and recover
Merge branch 'fileSystem' of github.com:xiangli-cmu/etcd into fileSystem
Merge branch 'fileSystem' into acl