before merge

Author: daviddias

.eslintrc

@@ -0,0 +1,4 @@
+{
+  "parser": "babel-eslint",
+  "extends": "standard"
+}

.gitignore

@@ -1,3 +1,5 @@
 node_modules
 some-test.js
 npm-debug.log
+sauce_connect.log
+test/tmp-disposable-nodes-addrs.json

.travis.yml

@@ -1,3 +1,7 @@
 language: node_js
 node_js:
   - "4.0"
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start

README.md

@@ -1,8 +1,7 @@
-IPFS API wrapper library for Node.js and the browser
-====================================================
+IPFS API wrapper library in JavaScript
+======================================
 
-[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io) [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/) [![](https://img.shields.io/badge/freenode-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs) [![Dependency Status](https://david-dm.org/ipfs/node-ipfs-api.svg?style=flat-square)](https://david-dm.org/ipfs/node-ipfs-api)
-[![Circle CI](https://circleci.com/gh/ipfs/node-ipfs-api.svg?style=svg)](https://circleci.com/gh/ipfs/node-ipfs-api)
+[![](https://img.shields.io/badge/made%20by-Protocol%20Labs-blue.svg?style=flat-square)](http://ipn.io) [![](https://img.shields.io/badge/project-IPFS-blue.svg?style=flat-square)](http://ipfs.io/) [![](https://img.shields.io/badge/freejs-%23ipfs-blue.svg?style=flat-square)](http://webchat.freenode.net/?channels=%23ipfs) [![Dependency Status](https://david-dm.org/ipfs/js-ipfs-api.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-api) [![Circle CI](https://circleci.com/gh/ipfs/js-ipfs-api.svg?style=svg)](https://circleci.com/gh/ipfs/js-ipfs-api)
 
 > A client library for the IPFS API.
 
@@ -25,7 +24,7 @@ var ipfs = ipfsAPI('localhost', '5001') // leaving out the arguments will defaul
 
 ### In the Browser through browserify
 
-Same as in Node.js, you just have to [browserify](https://github.com/substack/node-browserify) the code before serving it. See the browserify repo for how to do that.
+Same as in Node.js, you just have to [browserify](https://github.com/substack/js-browserify) the code before serving it. See the browserify repo for how to do that.
 
 ### In the Browser through `<script>` tag