Merge remote-tracking branch 'upstream/1.0' into 1.1

Author: pontusmelke

package.json

@@ -41,7 +41,7 @@
     "jasmine-reporters": "^2.0.7",
     "merge-stream": "^1.0.0",
     "minimist": "^1.2.0",
-    "phantomjs2-ext": "^0.1.0",
+    "phantomjs-prebuilt": "^2.1.7 ",
     "run-sequence": "^1.1.4",
     "through2": "~2.0.0",
     "vinyl-buffer": "^1.0.0",