Update Brocfile.js

Addresses https://github.com/stefanpenner/ember-cli/issues/274.

Rearranges trees and points of concatenation to allow ES6 `import`s for app modules in tests. Should also allow `start-app.js` test helper to use ES6 `import` instead of `require`s