move import statements to fully qualified path
begin broccolification
Merge branch 'master' of https://github.com/emberjs/data into broccoli

Conflicts:
	package.json
	packages/activemodel-adapter/lib/main.js
	packages/activemodel-adapter/lib/system/active_model_serializer.js
	packages/activemodel-adapter/lib/system/embedded_records_mixin.js
	packages/ember-data/lib/system/store.js
	packages/ember-inflector/lib/ext/string.js
	packages/ember-inflector/lib/main.js
	packages/ember-inflector/lib/system.js
	packages/ember-inflector/lib/system/inflections.js
	packages/ember-inflector/lib/system/inflector.js
	packages/ember-inflector/lib/system/string.js
remove testem-multi
update test commands
configuration tweaks for broccoli
make ember-inflector publicly installable
use package.json for broccoli commands
apparently build is a thing already in package.json
broccoli-cli needed for travis
add ember-defeatureify options back in
update testem to run from package.json
Merge branch 'master' of github.com:emberjs/data into broccoli

Conflicts:
	package.json
testem should use dot reporter instead of TAP
update README
build with ember-cli! \o/
use --environment production compared to broccoli-env
Merge pull request #2127 from fivetanley/broccoli

remove grunt, use testem and broccoli, build ember-inflector from bower