Merge branch 'master' into helios

.gitignore

@@ -8,6 +8,7 @@ server/FileServer*.js
 st/*.js
 
 # Ignoring run.js in test/
+test/amber_test_runner.js
 test/run.js
 
 # In case amber is also saved in a local Subversion

package.json

@@ -23,7 +23,7 @@
         "ambers": "./bin/server"
     },
     "scripts": {
-        "test": "./node_modules/grunt/bin/grunt amberc:amber_test_runner; node ./test/amber_test_runner.js"
+        "test": "sh -c 'grunt amberc:amber_test_runner' && node ./test/amber_test_runner.js"
     },
     "devDependencies": {
         "pegjs": "~0.7.0",