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

Use broccoli-merge-trees
Update and lock broccoli dependencies
Merge pull request #268 from HeroicEric/update-and-lock-dependencies

Update and lock broccoli dependencies