Merge pull request #458 from mixonic/add-diff

Add some tests, refactor render() to return a promise, use expand for options
Merge pull request #457 from rjackson/live-test-output

Maintain the live build output in tmp/output.
Allow dry-run option in new command
Merge pull request #461 from monocle/refactor

Allow dry-run option in new command
Allow a different Blueprint directory to be specified for Init and New commands
Merge pull request #435 from jakecraige/fix-pleasant-progress

fix pleasant progress throwing error when ran from child_process.exec, r...
Remove specifying rootURL from ENV

Specifying a rootURL should be optional and not based on the ENV rootURL, which should only be used to namespace assets in the `base href` tag. The previous functionality resulted in a bug where you would get a double url parameter if you serve your app from `/foo/index.html` and also specified a rootURL `/foo`, giving you `/foo/foo`. The router rootURL should be an opt-in configuration based on how a user decides to deploy their app.

https://github.com/stefanpenner/ember-cli/issues/417
Commands Init & New
1. change available option 'blueprint-path' to 'blueprint'
2. add acceptance test for 'blueprint' option
[changelog] Document blueprint argument for New and Init
Merge pull request #462 from monocle/refactor

Allow a different Blueprint directory to be specified for Init and New commands
align require statements per style guide

Was reading through source and figured I would line up require statements. Did initial pass through all files and commit as one PR.
Merge pull request #464 from denisnazarov/patch-1

Remove specifying rootURL from ENV
cleanup comma separated var statements

This test seems to violate the style guide. Also fixed typo in ARCHITECTURE.md
Use new `tmp/output` location for Testem.

This allows using the command line version of `testem` in addition to
running in CI mode (the current behavior).
Merge pull request #463 from rjackson/use-testem-json-for-testem-cwd

Use new `tmp/output` location for Testem.
Add `ember test --server`.
fixed per stefanpenner feedback
Merge pull request #474 from rjackson/live-test-server

Add `ember test --server`.
Remove `/tests` from express middleware in favor of `ember test --server`.
Merge pull request #476 from abuiles/remove-tests-from-express

Remove `/tests` from express middleware in favor of `ember test --server`