Update broccoli-es6-concatenator version

See https://github.com/joliss/broccoli-es6-concatenator/pull/17
Merge pull request #883 from wagenet/patch-1

Update broccoli-es6-concatenator version
Update ember-resolver to 0.1.1.

Major refactor of internals to split up giant functions a bit. Not a
breaking change.
Merge pull request #885 from rjackson/update-resolver

Update ember-resolver to 0.1.1.