diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..8501b6f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+test/test-repo/** text eol=lf
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..d2e373b0
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,41 @@
+language: node_js
+cache: npm
+stages:
+  - check
+  - test
+  - cov
+
+node_js:
+  - '10'
+
+os:
+  - linux
+  - osx
+  - windows
+
+script: npx nyc -s npm run test:node -- --bail
+after_success: npx nyc report --reporter=text-lcov > coverage.lcov && npx codecov
+
+jobs:
+  include:
+    - stage: check
+      script:
+        - npx aegir commitlint --travis
+        - npx aegir dep-check
+        - npm run lint
+
+    - stage: test
+      name: chrome
+      addons:
+        chrome: stable
+      script: npx aegir test -t browser
+
+    - stage: test
+      name: firefox
+      addons:
+        firefox: latest
+      script: npx aegir test -t browser -- --browsers FirefoxHeadless
+
+notifications:
+  email: false
+
diff --git a/README.md b/README.md
index 793e99ef..052ab363 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@
 [![](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)
 [![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
-[![Build Status](https://travis-ci.org/ipfs/js-ipfs-repo.svg)](https://travis-ci.org/ipfs/js-ipfs-repo) [![Circle CI](https://circleci.com/gh/ipfs/js-ipfs-repo.svg?style=svg)](https://circleci.com/gh/ipfs/js-ipfs-repo)
-[![Coverage Status](https://coveralls.io/repos/github/ipfs/js-ipfs-repo/badge.svg?branch=master)](https://coveralls.io/github/ipfs/js-ipfs-repo?branch=master) [![Dependency Status](https://david-dm.org/diasdavid/js-peer-id.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-repo)
+[![Travis CI](https://flat.badgen.net/travis/ipfs/js-ipfs-repo)](https://travis-ci.com/ipfs/js-ipfs-repo)
+[![codecov](https://codecov.io/gh/ipfs/js-ipfs-repo/branch/master/graph/badge.svg)](https://codecov.io/gh/ipfs/js-ipfs-repo) [![Dependency Status](https://david-dm.org/diasdavid/js-peer-id.svg?style=flat-square)](https://david-dm.org/ipfs/js-ipfs-repo)
 [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
-![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
-![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/npm-%3E%3D6.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D10.0.0-orange.svg?style=flat-square)
 
 > Implementation of the IPFS repo spec (https://github.com/ipfs/specs/tree/master/repo) in JavaScript
 
diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile
deleted file mode 100644
index c1e3f2cd..00000000
--- a/ci/Jenkinsfile
+++ /dev/null
@@ -1 +0,0 @@
-javascript()
diff --git a/package.json b/package.json
index 62fe79a4..e2be1dc3 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "npm": ">=3.0.0"
   },
   "devDependencies": {
-    "aegir": "^17.1.1",
+    "aegir": "^18.1.0",
     "chai": "^4.2.0",
     "dirty-chai": "^2.0.1",
     "lodash": "^4.17.11",
diff --git a/src/api-addr.js b/src/api-addr.js
index f5ba9b58..6dfe2aff 100644
--- a/src/api-addr.js
+++ b/src/api-addr.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const Key = require('interface-datastore').Key
-const Buffer = require('safe-buffer').Buffer
 
 const apiFile = new Key('api')
 
diff --git a/src/config.js b/src/config.js
index 15f00ec3..8b835beb 100644
--- a/src/config.js
+++ b/src/config.js
@@ -6,7 +6,6 @@ const waterfall = require('async/waterfall')
 const _get = require('lodash.get')
 const _set = require('lodash.set')
 const _has = require('lodash.has')
-const Buffer = require('safe-buffer').Buffer
 
 const configKey = new Key('config')
 
diff --git a/test/blockstore-test.js b/test/blockstore-test.js
index 45ae748a..a504d925 100644
--- a/test/blockstore-test.js
+++ b/test/blockstore-test.js
@@ -13,7 +13,6 @@ const each = require('async/each')
 const map = require('async/map')
 const _ = require('lodash')
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
 
 module.exports = (repo) => {
   describe('blockstore', () => {
diff --git a/test/test-repo/blocks/7J/CIQKKLBWAIBQZOIS5X7E32LQAL6236OUKZTMHPQSFIXPWXNZHQOV7JQ.data b/test/test-repo/blocks/7J/CIQKKLBWAIBQZOIS5X7E32LQAL6236OUKZTMHPQSFIXPWXNZHQOV7JQ.data
index 627ffcdf..9290f631 100644
--- a/test/test-repo/blocks/7J/CIQKKLBWAIBQZOIS5X7E32LQAL6236OUKZTMHPQSFIXPWXNZHQOV7JQ.data
+++ b/test/test-repo/blocks/7J/CIQKKLBWAIBQZOIS5X7E32LQAL6236OUKZTMHPQSFIXPWXNZHQOV7JQ.data
@@ -1,5 +1,6 @@
 
-�
�
+�
+�
                   IPFS -- Inter-Planetary File system
 
 IPFS is a global, versioned, peer-to-peer filesystem. It combines good ideas
@@ -52,4 +53,4 @@ IPFS has a name service:
 - serves to build trust chains
 - compatible with other NSes
 - can map DNS, .onion, .bit, etc to IPNS
-�
\ No newline at end of file
+�