Missing from 0c7a3ef58db4b64d25cae45a42712fff63d31472
0.2.0 automatically calls mergeTrees
Resolve test runner failure due to syntax error from unterminated string
Added missing velocity dependency to testem config
Merge pull request #26 from jdjkelly/master

Resolve test runner failure due to syntax error from unterminated string
rename main.js to emberui.js

Broccoli has some issues in requiring libraries from bower
https://github.com/broccolijs/broccoli/pull/91
there are attempts to fix this behaviour
https://github.com/joliss/broccoli-bower/blob/master/CHANGELOG.md#020

it could still be good to rename the distribution file to emberui.js
the `global` this and `named-amd` won't be affected (due to how
`broccoli-dist-es6-module` is implemented)

we'll need to test if this solves #21