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
Bumps grunt version to 0.4.2
Merge pull request #347 from twokul/grunt-upgrade

Bumps grunt version to 0.4.2
Add ES6 wrapper for ic-ajax.
Merge pull request #349 from rjackson/use_wrapper_for_ic-ajax

Add ES6 wrapper for ic-ajax.
whitelist ic for jshint
Merge pull request #351 from CodeOfficer/whitelist-ic

whitelist ic for jshint
Merge remote-tracking branch 'upstream/master' into feature/testem

Conflicts:
	Gruntfile.js
	app/app.js
	karma.conf.js
	package.json
Allow for modules without exports

They are undefined, so the seen[name] test would previously fail.
Merge pull request #357 from joliss/loader

Allow for modules without exports
Latest grunt-ember-templates uses NPM package deps

This allows us to specify the specific versions of
`ember-template-compiler` and `handlebars` that our applications need
directly in our `package.json`.
Merge pull request #358 from rjackson/use_packages_for_template_compiler

Latest grunt-ember-templates uses NPM package deps
support for emberscript
Merge pull request #362 from ghempton/emberscript

support for emberscript
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?