ember-addons · danshapir · Sep 1, 2014 · Jan 25, 2015 · Feb 19, 2015 · Feb 19, 2015
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/bootstrap-for-ember-Dan.iml b/.idea/bootstrap-for-ember-Dan.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git a/.idea/libraries/bootstrap_for_ember_Dan_node_modules.xml b/.idea/libraries/bootstrap_for_ember_Dan_node_modules.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -37,9 +37,9 @@ module.exports = function (grunt) {
                 files: ['<%= yeoman.app %>/styles/{,*/}*.{scss,sass}'],
                 tasks: ['compass:server']
             },
-            ember_templates: {
+            emberTemplates: {
                 files: '<%= yeoman.app %>/templates/**/*.hbs',
-                tasks: ['ember_templates']
+                tasks: ['emberTemplates']
             },
             markdown: {
                 files: '<%= yeoman.app %>/templates/**/*.md',
@@ -309,7 +309,7 @@ module.exports = function (grunt) {
             server: [
                 'compass',
                 'markdown',
-                'ember_templates',
+                'emberTemplates',
                 'coffee:dist'
             ],
             test: [
@@ -318,19 +318,22 @@ module.exports = function (grunt) {
             dist: [
                 'coffee',
                 'markdown',
-                'ember_templates',
+                'emberTemplates',
                 'compass',
                 'imagemin',
                 'svgmin',
                 'htmlmin'
             ]
         },
-        ember_templates: {
+        emberTemplates: {
             compile_components: {
                 options: {
                     templateName: function(filename) {
                         return filename.substring(filename.lastIndexOf('/components/')+1,filename.length);
                     },
+					amd: false,
+                    handlebarsPath: 'app/bower_components/handlebars/handlebars.js',
+                    templateCompilerPath: 'app/bower_components/ember/ember-template-compiler.js',
                     namespace: "Ember.TEMPLATES"
                 },
                 files: {

diff --git a/app/.idea/.name b/app/.idea/.name
diff --git a/app/.idea/app.iml b/app/.idea/app.iml
diff --git a/app/.idea/encodings.xml b/app/.idea/encodings.xml
diff --git a/app/.idea/misc.xml b/app/.idea/misc.xml
diff --git a/app/.idea/modules.xml b/app/.idea/modules.xml
diff --git a/app/.idea/scopes/scope_settings.xml b/app/.idea/scopes/scope_settings.xml
diff --git a/app/.idea/vcs.xml b/app/.idea/vcs.xml
diff --git a/app/.idea/workspace.xml b/app/.idea/workspace.xml