Merge remote-tracking branch 'origin/jshint' into jshint

Author: benholloway

package.json

@@ -15,7 +15,7 @@
     "babel"
   ],
   "scripts": {
-    "test": "npm run lint && node node_modules/jasmine-node/bin/jasmine-node --verbose --captureExceptions test/specs",
+    "test": "node node_modules/jasmine-node/bin/jasmine-node --verbose --captureExceptions test/specs && npm run lint",
     "testonly": "node node_modules/jasmine-node/bin/jasmine-node --captureExceptions test/specs",
     "lint": "node ./test/jshint.js"
   },