Merge branch 'develop' into develop_fit

bower.json

@@ -4,7 +4,7 @@
   "main": ["dist/vis.min.js", "dist/vis.min.css"],
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
-  "license": "(Apache-2.0 OR MIT)",
+  "license": ["Apache-2.0", "MIT"],
   "repository": {
     "type": "git",
     "url": "git://github.com/almende/vis.git"

package.json

@@ -52,5 +52,8 @@
     "uglify-js": "^2.4.20",
     "webpack": "^1.8.5",
     "yargs": "^3.7.2"
+  },
+  "browserify": {
+    "transform": ["babelify"]
   }
 }