Introduce a diff option to the overwrite prompt
Use separate .jshintrc for tests/ and app/.
Set base tag in template

https://github.com/stefanpenner/ember-cli/issues/417
Merge pull request #487 from rjackson/fix-base-tag

Set base tag in template
Merge pull request #488 from rjackson/fix-jshint-root

Use separate .jshintrc for tests/ and app/.
Add testem.log to gitignore

testem.log is generated if you start testem in debug mode: `testem -d`
Merge pull request #494 from machty/patch-2

Add testem.log to gitignore
Custom watcher to make broccoli more stable on windows
Merge pull request #493 from stefanpenner/broccoli-fix

Nasty broccoli fix to make it more stable on windows
Move qunit related stuff to ember-app.
Merge pull request #495 from abuiles/move-out-qunit-from-brocfile

Move qunit related stuff to ember-app.