Use broccoli-merge-trees
Merge pull request #267 from HeroicEric/broccoli-merge-trees

Use broccoli-merge-trees
Update and lock broccoli dependencies
Merge pull request #268 from HeroicEric/update-and-lock-dependencies

Update and lock broccoli dependencies
Updates changelog
Merge pull request #269 from twokul/updates-changelog

Updates changelog
Fixes #270 - return mergeTrees from brocfile
Merge pull request #271 from andrewcohen/master

Fixes #270 - return mergeTrees from brocfile
bump version of package.json
bump v0.0.22 :tada:
Restructure README heading levels
Merge pull request #272 from HeroicEric/rearrange-readme

Restructure README heading levels
lazily require npm + bower which speeds up startup time 3x

1.4s -> 0.4s
only denodeify once.
Merge pull request #273 from stefanpenner/speed-up-boot

Speed up boot
Deletes an obsolete line
Merge pull request #286 from twokul/deletes-obsolete-line

Deletes an obsolete line
Indentation

so much for indented code
Merge pull request #287 from twokul/alignment

Indentation
Detect whether ember-cli was installed via npm or via npm link.