fixed merge conflicts

Author: marcelduran

.travis.yml

@@ -1,3 +1,4 @@
 language: node_js
 node_js:
+  - "0.10"
   - "0.8"

package.json

@@ -33,7 +33,7 @@
     "node": ">=0.8.1"
   },
   "dependencies": {
-    "commander": "~1.3.2",
+    "commander": "~2.0.0",
     "mocha": "~1.12.0",
     "xml2js": "~0.2.8"
   },

test/helpers/nock-server.js

@@ -49,12 +49,12 @@ var reqResMap = {
   '/xmlResult.php?test=120816_V2_3': 'testResultsNotFound.xml',
   '/runtest.php?url=&f=json': 'runTestInvalid.json',
   '/runtest.php?script=&f=json': 'runTestInvalid.json',
-  '/getgzip.php?test=120816_V2_3&file=1_pagespeed.txt': undefined,
+  '/getgzip.php?test=120816_V2_3&file=1_pagespeed.txt': '',
   '/export.php?test=120816_V2_3': 'harNotFound.json',
   '/waterfall.php?test=120816_V2_3&run=1&cached=0': 'waterfallNotFound.png',
   '/thumbnail.php?test=120816_V2_3&run=1&cached=0&file=1_waterfall.png': 'waterfallThumbnailNotFound.png',
-  '/thumbnail.php?test=120816_V2_3&file=1_screen.jpg&run=1&cached=0': undefined,
-  '/cancelTest.php?test=120816_V2_4': undefined,
+  '/thumbnail.php?test=120816_V2_3&file=1_screen.jpg&run=1&cached=0': '',
+  '/cancelTest.php?test=120816_V2_4': '',
   '/runtest.php?url=http%3A%2F%2Fapikey.com&f=json': 'runTestNoAPIKey.json',
   '/runtest.php?url=http%3A%2F%2Fapikey.com&k=12345&f=json': 'runTestInvalidAPIKey.json'
 };