clean up tree.go and watcher.go
Merge pull request #5 from xiangli-cmu/master

clean up tree.go and watcher.go