Fixed markdown syntax typo in Changelog
Merge pull request #438 from davewasmer/patch-2

Fixed markdown syntax typo in Changelog
Remove duplicate broccoli-merge-trees require
Merge pull request #442 from JohnColvin/patch-1

Remove duplicate broccoli-merge-trees require
Cleanup after `server` and `build` commands.

Ensure that `tmp/` is cleaned up when the command is finished.

@danmcclain / @rjackson
Merge pull request #444 from rjackson/pruning

Cleanup after `server` and `build` commands.
fix jshint
removing insight, adding leek
Adds tracking code
Adds Leek
Moving to injection dependencies instead of passing them as parameters
Make testem.js available on development.

Read test options from config file (Testem always tries to do it).

If we don't pass it then it will try to read from the following list
https://github.com/airportyh/testem/blob/master/lib/config.js#L41,
finding testem.js and breaking the app.

Fix indentation.
Merge pull request #432 from abuiles/testem.js

Add dummy file.
Use github shorthand in bower.json
Use github shorthand for repo field in package.json
Merge pull request #446 from xtian/github-shorthand

Use github shorthand in bower.json
Re-add master branch to ember-resolver in bower.json
Merge pull request #447 from xtian/github-shorthand

Re-add master branch to ember-resolver in bower.json
Fixing tests
Tracking Livereload