diff --git a/.gitignore b/.gitignore
index e4c5b0e..2ea0e2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ build
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 
+docs
 lib
 dist
 test/test-data/go-ipfs-repo/LOCK
@@ -40,3 +41,4 @@ test/test-data/go-ipfs-repo/LOG.old
 
 # while testing npm5
 package-lock.json
+yarn.lock
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 584f308..371bf0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,7 @@ matrix:
 script:
   - npm run lint
   - npm run test
-  - npm run coverage
-  - make test
+  - npm run coverage -- --upload
 
 before_script:
   - export DISPLAY=:99.0
diff --git a/package.json b/package.json
index 2a8bc89..9c9ed85 100644
--- a/package.json
+++ b/package.json
@@ -5,16 +5,15 @@
   "main": "src/index.js",
   "bin": "src/bin.js",
   "scripts": {
-    "lint": "aegir-lint",
-    "build": "aegir-build",
-    "test": "aegir-test",
-    "test:node": "aegir-test node",
-    "test:browser": "aegir-test browser",
-    "release": "aegir-release",
-    "release-minor": "aegir-release --type minor",
-    "release-major": "aegir-release --type major",
-    "coverage": "aegir-coverage",
-    "coverage-publish": "aegir-coverage publish"
+    "lint": "aegir lint",
+    "build": "aegir build",
+    "test": "aegir test",
+    "test:node": "aegir test -t node",
+    "test:browser": "aegir test -t browser -t webworker",
+    "release": "aegir release",
+    "release-minor": "aegir release --type minor",
+    "release-major": "aegir release --type major",
+    "coverage": "aegir coverage"
   },
   "keywords": [
     "IPFS"
@@ -34,14 +33,14 @@
   },
   "homepage": "https://github.com/libp2p/js-peer-id",
   "devDependencies": {
-    "aegir": "^11.0.2",
+    "aegir": "^12.0.6",
     "chai": "^4.1.2",
     "dirty-chai": "^2.0.1",
     "pre-commit": "^1.2.2"
   },
   "dependencies": {
     "async": "^2.5.0",
-    "libp2p-crypto": "~0.9.4",
+    "libp2p-crypto": "~0.10.3",
     "lodash": "^4.17.4",
     "multihashes": "~0.4.9"
   },
@@ -60,4 +59,4 @@
     "nginnever <ginneversource@gmail.com>",
     "npmcdn-to-unpkg-bot <npmcdn-to-unpkg-bot@users.noreply.github.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/index.js b/src/index.js
index 9a8983f..6722518 100644
--- a/src/index.js
+++ b/src/index.js
@@ -8,7 +8,6 @@ const mh = require('multihashes')
 const crypto = require('libp2p-crypto')
 const assert = require('assert')
 const waterfall = require('async/waterfall')
-const Buffer = require('safe-buffer').Buffer
 
 class PeerId {
   constructor (id, privKey, pubKey) {
diff --git a/test/peer-id.spec.js b/test/peer-id.spec.js
index 0a4e506..a7f0eac 100644
--- a/test/peer-id.spec.js
+++ b/test/peer-id.spec.js
@@ -9,7 +9,6 @@ const expect = chai.expect
 const crypto = require('libp2p-crypto')
 const mh = require('multihashes')
 const parallel = require('async/parallel')
-const Buffer = require('safe-buffer').Buffer
 
 const PeerId = require('../src')
 
@@ -103,7 +102,9 @@ describe('PeerId', () => {
     })
   })
 
-  it('Non-default # of bits', (done) => {
+  it('Non-default # of bits', function (done) {
+    // rsa is slow atm
+    this.timeout(20000)
     PeerId.create({ bits: 1024 }, (err, shortId) => {
       expect(err).to.not.exist()
       PeerId.create({ bits: 4096 }, (err, longId) => {