Allow access to locals in fileMapTokens
Move customLocals
Add test to ensure locals don't conflate with output of fileMap
Merge pull request #2320 from chadhietala/options-to-tokens

Allow access to locals in fileMapTokens
Update git-init.js
Merge pull request #2387 from quaertym/master

Update git-init.js
Update to Ember 1.8.0 by default.
Merge pull request #2393 from rwjblue/update-ember-stable

Update to Ember 1.8.0 by default.
Allow production app testing.
Merge pull request #2397 from rwjblue/allow-production-app-testing

Allow production app testing.
Adds optional globbing to init with `ember init <glob-pattern>`, and moves original functionality to `ember init --name=<app-name>` #2156
Merge pull request #2197 from trabus/init-path-glob

ember init <path/to/file> or <glob> should apply init to those files
remove dead code

The location property of the router already gets set in line 33 of
config/environment.js. Reopening the router and setting the property in
start-app.js does not have any effect.

It seems that this code should have been removed as part of commit 8158db
Merge pull request #2413 from pogopaule/master

remove dead code
Some minor improvements, mainly links.
Merge pull request #2416 from kgish/master

Some minor improvements, mainly links.