Support es6 files as javascript

joefiorini · kevinsawicki · commit 988eff4e8432 · 2014-03-01T13:13:56.000-08:00
The `ember-appkit-rails` library uses the `.es6` extension to support ES6
modules. Adds support for this type.

Conflicts:
	grammars/javascript.cson
diff --git a/grammars/javascript.cson b/grammars/javascript.cson
@@ -4,6 +4,7 @@
   'htc'
   'jsx'
   '_js'
+  'es6'
 ]
 'firstLineMatch': '^#!.*\\bnode'
 'keyEquivalent': '^~J'
