fix: bring latest changes from master

Author: dryajov

package.json

@@ -53,7 +53,7 @@
     "async": "^2.6.0",
     "detect-node": "^2.0.3",
     "go-ipfs-dep": "0.4.11",
-    "ipfs-api": "^17.1.1",
+    "ipfs-api": "^14.3.5",
     "multiaddr": "^3.0.1",
     "once": "^1.4.0",
     "rimraf": "^2.6.2",
@@ -62,13 +62,13 @@
     "truthy": "0.0.1"
   },
   "devDependencies": {
-    "aegir": "^12.2.0",
+    "aegir": "^12.1.3",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "ipfs": "^0.26.0",
     "is-running": "1.0.5",
     "mkdirp": "^0.5.1",
-    "multihashes": "~0.4.12",
+    "multihashes": "~0.4.10",
     "pre-commit": "^1.2.2",
     "safe-buffer": "^5.1.1"
   },

test/exec.spec.js

@@ -2,7 +2,11 @@
 /* eslint-env mocha */
 'use strict'
 
-const expect = require('chai').expect
+const chai = require('chai')
+const dirtyChai = require('dirty-chai')
+const expect = chai.expect
+chai.use(dirtyChai)
+
 const isrunning = require('is-running')
 const cp = require('child_process')
 const path = require('path')
@@ -57,7 +61,7 @@ function makeCheck (n, done) {
 // exiting as it once was when the test was designed
 // - [ ] Need test vector or figure out why tail changed
 // Ref: https://github.com/ipfs/js-ipfsd-ctl/pull/160#issuecomment-325669206
-describe.skip('exec', () => {
+describe('exec', () => {
   it('SIGTERM kills hang', (done) => {
     const tok = token()
 

test/spawning-daemons.js

@@ -343,13 +343,6 @@ module.exports = () => {
           })
         })
 
-        // skip on windows for now
-        // https://github.com/ipfs/js-ipfsd-ctl/pull/155#issuecomment-326970190
-        // fails on windows see https://github.com/ipfs/js-ipfs-api/issues/408
-        if (isWindows) {
-          return it.skip('uses the correct ipfs-api')
-        }
-
         it('uses the correct ipfs-api', (done) => {
           ipfs.util.addFromFs(path.join(__dirname, 'fixtures/'), {
             recursive: true