Merge branch 'master' of github.com:mzabriskie/axios into xDomainRequestSupport

Conflicts:
	package.json

.travis.yml

@@ -2,7 +2,5 @@ language: node_js
 email:
   on_failure: change
   on_success: never
-before_script:
-  - npm install -g grunt-cli
 after_success:
   - npm run coveralls

lib/adapters/xhr.js

@@ -4,7 +4,7 @@
 
 var defaults = require('./../defaults');
 var utils = require('./../utils');
-var buildURL = require('./../helpers/buildUrl');
+var buildURL = require('./../helpers/buildURL');
 var parseHeaders = require('./../helpers/parseHeaders');
 var transformData = require('./../helpers/transformData');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');

lib/helpers/buildURL.js

@@ -65,3 +65,4 @@ module.exports = function buildURL(url, params, paramsSerializer) {
 
   return url;
 };
+

package.json

@@ -4,8 +4,8 @@
   "description": "Promise based HTTP client for the browser and node.js",
   "main": "index.js",
   "scripts": {
-    "build": "grunt build",
+    "build": "./node_modules/.bin/grunt build",
-    "test": "grunt test",
+    "test": "./node_modules/.bin/grunt test",
     "start": "node ./sandbox/server.js",
     "examples": "node ./examples/server.js",
     "coveralls": "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

test/specs/helpers/buildURL.spec.js

@@ -63,3 +63,4 @@ describe('helpers::buildURL', function () {
   })
 });
 
+