Allow custom commands to be accessed in blueprints
Single/doubl quotes
fixes the express not define error
fixes the tests errors
Allow addons to be vendored outside of node modules

In package.json you can add paths for additional addons

```json
"ember-addon": {
  "paths": [
    "./lib/super-button"
  ]
}
```

The vendored library must conform to the addon spec, so it must have a
properly declared `package.json` file as well as its own loader.
Merge pull request #1370 from bcardarella/bc-addon-discovery

Allow addons to be vendored outside of node modules
Add verbose option to version command
Add test for version command.
Merge pull request #1307 from dschmidt/master

Add verbose option to version command
Improve regex for finding existing routes
Merge pull request #1363 from fordguo/master

fixes the express not define error
Tests = happiness
Merge pull request #1350 from James1x0/master

Allow custom commands to be accessed in blueprints
Merge pull request #1371 from kimroen/improve-route-check

Improve regex for finding existing routes
Remove slash from some generator-locals

Conflicts:
	CHANGELOG.md