refactor(module+tests): Enable running the tests

individually and reduce complexity inside ipfs-api

Author: daviddias

README.md

@@ -105,9 +105,7 @@ $ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin "[\"http://exam
 
 ### API
 
-> `WIP`
-
-`js-ipfs-api` follows the spec defined by [`interface-ipfs-core`](https://github.com/ipfs/interface-ipfs-core), which concerns the interface to expect from IPFS implementations. This interface is a currently active endeavor - expect it to be complete in the next few weeks (August 2016). You can use it today to consult the methods available.
+> `js-ipfs-api` follows the spec defined by [`interface-ipfs-core`](https://github.com/ipfs/interface-ipfs-core), which concerns the interface to expect from IPFS implementations. This interface is a currently active endeavor - expect it to be complete in the next few weeks (August 2016). You can use it today to consult the methods available.
 
 ### Utility functions
 
@@ -140,6 +138,7 @@ This is very similar to `ipfs.files.add({path:'', content: stream})`. It is like
 
 ```JavaScript
 ```
+>>>>>> refactor(module+tests): Enable running the tests
 
 ### Callbacks and promises
 
@@ -166,8 +165,6 @@ We run tests by executing `npm test` in a terminal window. This will run both No
 
 
 
->>>>>>> kick off ipfs-api next generation
-
 ## Contribute
 
 The js-ipfs-api is a work in progress. As such, there's a few things you can do right now to help out:

package.json

@@ -1,8 +1,8 @@
 {
   "name": "ipfs-api",
   "version": "6.0.3",
-  "description": "A client library for the IPFS API",
-  "main": "src/index.js",
+  "description": "A client library for the IPFS HTTP API. Follows interface-ipfs-core spec",
+  "main": "lib/index.js",
   "jsnext:main": "src/index.js",
   "scripts": {
     "test": "gulp test",

test/tmp-disposable-nodes-addrs.json

@@ -0,0 +1 @@
+{"c":"/ip4/127.0.0.1/tcp/56459","a":"/ip4/127.0.0.1/tcp/56466","b":"/ip4/127.0.0.1/tcp/56479"}