Remove placeholder stuff
Update Readme
Merge branch 'master' of https://github.com/colintoh/ember-brunch-2359

Conflicts:
	README.md