Merge branch 'master' into issue-197-misc-refactoring

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-- '0.12'
+- '4.4.3'
 before_script:
 - npm install grunt-cli -g
 script:

package.json

@@ -28,13 +28,13 @@
     "tag": "next"
   },
   "devDependencies": {
-    "babel-core": "^6.7.7",
+    "babel-core": "^6.8.0",
     "babel-eslint": "6.0.4",
     "babel-loader": "^6.0.1",
     "babel-preset-es2015": "^6.5.0",
     "babel-plugin-transform-es2015-classes": "^6.7.7",
     "clean-webpack-plugin": "^0.1.9",
-    "grunt": "^0.4.5",
+    "grunt": "^1.0.1",
     "grunt-babel": "^6.0.0",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-connect": "^1.0.2",