opps
complete initial refactor
Merge branch 'layout-refactor'

Conflicts:
	app/config/app.coffee
	app/config/store.coffee
	app/initialize.coffee
	app/templates/application.hbs
	app/templates/index.hbs
	config.coffee
	generators/controller/generator.json
	generators/model/generator.json
	generators/template/generator.json
	generators/view/generator.json
	generators/view/view.coffee.hbs
	package.json
	public/index.html
	public/javascripts/app.js
	public/javascripts/app.js.map
	public/javascripts/vendor.js
	public/javascripts/vendor.js.map
	public/stylesheets/app.css
	public/stylesheets/app.css.map
	public/test/javascripts/test.js
	public/test/javascripts/test.js.map
	public/test/stylesheets/test.css
	public/test/stylesheets/test.css.map
	test/public/javascripts/vendor.js
	test/public/stylesheets/app.css
	vendor/scripts/ember-latest.js
	vendor/scripts/ember.js
	vendor/scripts/handlebars.js