WIP ES6 lol
move grunt tasks into folders
move some requires around
Merge branch 'master' of https://github.com/emberjs/data into es6

Conflicts:
	packages/activemodel-adapter/lib/system/active_model_adapter.js
	packages/activemodel-adapter/lib/system/active_model_serializer.js
	packages/ember-data/lib/system/model/model.js
	tests/ember_configuration.js
add watch option, fix some test oddities
fix banner generation a bit
Merge branch 'master' of https://github.com/emberjs/data into es6

Conflicts:
	packages/activemodel-adapter/lib/system/active_model_adapter.js
	packages/ember-data/lib/adapters/rest_adapter.js
	packages/ember-data/lib/initializers.js
	packages/ember-data/tests/integration/application_test.js
fix build, import more test helper definitions from ember-dev
readd ContainerProxy to DS namespace
update README with grunt workflow
add grunt and bower install to .travis.yml
Merge branch 'master' of https://github.com/emberjs/data into es6
Merge pull request #1623 from fivetanley/es6

WIP ES6 lol