Use broccoli-merge-trees
Merge pull request #267 from HeroicEric/broccoli-merge-trees

Use broccoli-merge-trees
Update and lock broccoli dependencies