Use broccoli-merge-trees

This fixes https://github.com/stefanpenner/ember-cli/issues/265

- Added broccoli-merge-trees dependency
- Updated Brocfile to use broccoli-merge-trees