vendorFiles should maintain its order even when it's overridden
Add ability to remove asset from vendorFiles by passing null
Merge pull request #2312 from Keoven/fix/vendor-files

vendorFiles should maintain its order even when it's overridden
Move bowerDirectory inside project
Merge pull request #2287 from quaertym/patch-13

Set bowerDirectory for project
improve .travis.yml

* force install of npm 2.x
* disable spinner
Allow access to locals in fileMapTokens
Move customLocals
Update CHANGELOG

Through cf5f8edd1c1a5.
Bump version.
Bump broccoli-merge-trees version.

Properly uses `symlink-or-copy` to allow iteration for Windows users.
Merge pull request #2323 from stefanpenner/update-travis-stuff

improve .travis.yml
Upgrade ember-data to v1.0.0-beta.11
Merge pull request #2324 from quaertym/update-ember-data

Upgrade ember-data to v1.0.0-beta.11
Ensure ember-resolver version
Merge pull request #2330 from bcardarella/bc-update-bower-dep-version

Ensure ember-resolver version
Add test to ensure locals don't conflate with output of fileMap
remove whitespace
alphabetize package.json

`npm install --save-dev` alphabetizes package.json, and I `ember init`
my app every ember-cli update and check the diffs, so this would be an
inconsistency.
Merge pull request #2341 from kellyselden/alphabetiz-package-json

alphabetize package.json