Avoid conflicts with ember-cli-htmlbars-inline-precompile#317

rwjblue merged 2 commits intoember-cli:masterember-cli/ember-cli-htmlbars:masterfrom

rwjblue:prevent-conflicts-with-legacy-inline-compilerrwjblue/ember-cli-htmlbars:prevent-conflicts-with-legacy-inline-compilerCopy head branch name to clipboard