replaced karma with testem
Merge branch 'master' into pr/292
fix testum to rebuild correctly
Merge pull request #1 from stefanpenner/fix-pr-292

Fix pr 292
Merge remote-tracking branch 'upstream/master' into feature/testem

Conflicts:
	Gruntfile.js
	app/app.js
	karma.conf.js
	package.json
add .em files to watch:scripts
Merge pull request #366 from ghempton/emberscript

add .em files to watch:scripts
isolatedContainer should know what not to instantiate

No reason to make people write this boilerplate themselves, right?
Add default config setup.

Allows specifying configuration in the following files:

* `config/environment.js` - This is loaded in all enviroments.
* `config/environments/production.js` - This is loaded when
  building with `grunt dist`.
* `config/environments/development.js` - This is loaded when
  building a normal development server (via `grunt server` generally).
* `config/environments/test.js` - This is loaded when running tests via
  either browsing to `/tests` URL or running via karma.
Merge pull request #370 from rjackson/add_config

Add default config setup.
Don't destroy global config object

This will encourage people not to destory their window.ENV object by
reassigning it a completely new value.

The environemnt specific files should load after `environemnt.js` has
loaded. This way the values assigned to `window.ENV` in those
environment specific files can overwrite any defaults set in
`environment.js`

I have also cleaned up the comments somewhat and included a simple
example of setting a config value.
Merge pull request #372 from bcardarella/bc-cleaner-default-env-files

Don't destroy global config object
Bump ic-ajax

Bump to the version of ic-ajax that distinguishes
between ic.ajax and ic.ajax.raw
Suppress Express deprecation warning
Merge pull request #380 from jas/express-deprecation-warning

Suppress Express deprecation warning caused by `bodyParser` middleware
Updated grunt file to reference using appkit compatible loom
Merge pull request #381 from cavneb/feature/update-loom-npm

Updated grunt file to reference using appkit compatible loom
adds ember-testing-httpRespond to bower.json #369
Merge pull request #382 from fsmanuel/master

adds ember-testing-httpRespond to bower.json #369
Merge remote-tracking branch 'upstream/master' into feature/testem