Upgrade broccoli-merge-trees to 0.2.0

Allows merging with symlinks