Improve package.json scripts

* Run lint after tests as often code style is broken intentionally
during refactoring
* Reduce duplication of mocha watch

Author: simonsmith

package.json

@@ -45,9 +45,10 @@
     "sinon-chai": "^2.8.0"
   },
   "scripts": {
-    "test": "npm run lint && mocha --reporter spec --slow 400 --timeout 8000",
+    "test": "npm run mocha && npm run lint",
+    "mocha": "mocha --reporter spec --slow 400 --timeout 8000",
     "lint": "eslint lib/index.js test/test.js bin/suitcss",
-    "watch": "mocha --watch --reporter spec --slow 400"
+    "watch": "npm run mocha -- --watch"
   },
   "keywords": [
     "css",