Manual merge of

Author: pascalduez

Makefile

@@ -15,7 +15,7 @@ dist: $(DIST)
 
 dist/%.js: src/%.js
 	mkdir -p $(@D)
-	6to5 --optional selfContained $< -o $@
+	6to5 $< -o $@
 
 min: assets/js/main.min.js
 

package.json

@@ -22,9 +22,9 @@
   ],
   "main": "dist",
   "dependencies": {
-    "6to5-runtime": "^3.2.1",
     "chroma-js": "^0.6.3",
     "es6-denodeify": "^0.1.0",
+    "es6-promise": "^2.0.1",
     "extend": "^2.0.0",
     "fs-extra": "^0.16.3",
     "html-minifier": "^0.7.0",

src/index.js

@@ -1,5 +1,6 @@
 import chroma from 'chroma-js';
 import def from '../default';
+import { Promise } from 'es6-promise';
 import denodeify from 'es6-denodeify';
 import extend  from 'extend';
 import fs from 'fs';