Updated dev dependencies (e.g. Broccoli v0.12.0)
Removed final call to merge trees

No longer necessary in updated broccoli-dist-es6-module
Updated dist