switch to grunt-ember-templates instead of grunt-ember-handlebars
Merge branch 'master' into gh-pages