Re-built from ember-app-kit git