Merge branch 'master' into up-to-date

.bumpedrc

@@ -0,0 +1,31 @@
+files: [
+  'package.json'
+]
+
+plugins:
+
+  prerelease:
+
+    'Linting config files':
+      plugin: 'bumped-finepack'
+
+  postrelease:
+
+    'Generating CHANGELOG file':
+      plugin: 'bumped-changelog'
+
+    'Commiting new version':
+      plugin: 'bumped-terminal'
+      command: 'git add CHANGELOG.md package.json && git commit -m "Release $newVersion"'
+
+    'Detecting problem before publish':
+      plugin: 'bumped-terminal'
+      command: 'git-dirty && npm test'
+
+    'Publishing tag at GitHub':
+      plugin: 'bumped-terminal'
+      command: 'git tag $newVersion && git push && git push --tags'
+
+    'Publishing at NPM':
+      plugin: 'bumped-terminal'
+      command: 'npm publish'

.travis.yml

@@ -6,15 +6,5 @@ node_js:
   - "0.12"
   - "0.10"
   - "iojs"
-before_install:
-  - npm install -g phantomjs
-env:
-  - CXX=g++-4.8
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - g++-4.8
 script: npm run-script coveralls
 after_script: "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"

package.json

@@ -42,17 +42,16 @@
     "mocha": "latest",
     "mocha-lcov-reporter": "~1.2.0",
     "multiline": "~1.0.2",
-    "rimraf": "~2.5.2",
-    "standard": "~6.0.8",
-    "x-ray-phantom": "~1.0.0"
+    "rimraf": "~2.3.2",
+    "standard": "~6.0.8"
   },
   "engines": {
     "node": ">= 0.10"
   },
   "scripts": {
+    "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly",
     "pretest": "standard",
-    "test": "mocha",
-    "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/.bin/_mocha --report lcovonly"
+    "test": "mocha"
   },
   "license": "MIT"
 }