use npm test to run npm tests

Makefile

@@ -11,7 +11,7 @@ build:
 
 test:
 	godep go test -v ./pkg/...
-	npm run test
+	npm test
 
 run:
 	./bin/grafana-server

circle.yml

@@ -25,12 +25,12 @@ test:
      # Go test
      - godep go test -v ./pkg/...
      # js tests
-     - ./node_modules/grunt-cli/bin/grunt test
+     - npm test
      - npm run coveralls
 
 deployment:
   master:
     branch: master
     owner: grafana
-    commands: 
+    commands:
       - ./trigger_grafana_packer.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}