fixes

Author: dignifiedquire

.travis.yml

@@ -1,8 +1,15 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - stable
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
 
 # Make sure we have new NPM.
 before_install:
@@ -13,12 +20,17 @@ script:
   - npm test
   - npm run coverage
 
-addons:
-  firefox: 'latest'
-
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 after_success:
   - npm run coverage-publish
+
+addons:
+  firefox: 'latest'
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

package.json

@@ -2,16 +2,15 @@
   "name": "ipfs-bitswap",
   "version": "0.7.1",
   "description": "Node.js implementation of the Bitswap data exchange protocol used by IPFS",
-  "main": "lib/index.js",
-  "jsnext:main": "src/index.js",
+  "main": "src/index.js",
   "scripts": {
-    "test": "PHANTOM=off aegir-test",
-    "test:browser": "PHANTOM=off aegir-test browser",
+    "test": "aegir-test",
+    "test:browser": "aegir-test browser",
     "test:node": "aegir-test node",
     "lint": "aegir-lint",
-    "release": "PHANTOM=off aegir-release",
-    "release-minor": "PHANTOM=off aegir-release --type minor",
-    "release-major": "PHANTOM=off aegir-release --type major",
+    "release": "aegir-release",
+    "release-minor": "aegir-release --type minor",
+    "release-major": "aegir-release --type major",
     "build": "aegir-build",
     "coverage": "aegir-coverage",
     "coverage-publish": "aegir-coverage publish"
@@ -33,7 +32,7 @@
   },
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "devDependencies": {
-    "aegir": "^8.0.1",
+    "aegir": "^9.0.0",
     "buffer-loader": "0.0.1",
     "chai": "^3.5.0",
     "fs-pull-blob-store": "^0.3.0",

src/message/message.proto.js

@@ -1,7 +1,6 @@
 'use strict'
 
-module.exports = `
-package bitswap.message.pb;
+module.exports = `package bitswap.message.pb;
 
 message Message {
 
@@ -19,5 +18,4 @@ message Message {
 
   optional Wantlist wantlist = 1;
   repeated bytes blocks = 2;
-}
-`
+}`