Fix typo

composer.lock

 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
+        "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
     ],
     "hash": "016b7b6646d1d3ec6d8b574b5a6c5561",
     "packages": [

tests/lib/screenshot-testing/config.js

@@ -10,7 +10,7 @@
 /**
  * The root Piwik URL to test against.
  */
-exports.piwikUrl = "http://localhost/piwik-master/";
+exports.piwikUrl = "http://localhost/";
 
 /**
  * Data for the $_SERVER variable in the setup/teardown PHP scripts. Should be the same as
@@ -18,7 +18,7 @@ exports.piwikUrl = "http://localhost/piwik-master/";
  */
 exports.phpServer = {
     HTTP_HOST: 'localhost',
-    REQUEST_URI: '/piwik-master/',
+    REQUEST_URI: '/',
     REMOTE_ADDR: '127.0.0.1'
 };