accepted changes from damokles and ooooaki

README.md

@@ -19,7 +19,7 @@ report page.
 
 1. copy all files into an extra directory in your webspace
 2. make the directory `/data` writable by the user running cron.php (see below)
-3. edit `/config/config.php` to your own desires
+3. cp `/config/config.php.dist` to `/config/config.php` and edit it
 4. create a cron job that calls cron.php periodically (e.g. every 10mins)  
    example: `*/10 * * * * user  php5 -f /path/to/cron.php 2>&1 > /dev/null`
 5. open the Franklin root directory in your webbrowser to see the reports

lib/tests/GoogleSERPTest.php

@@ -54,7 +54,7 @@ public function run()
 		}
 		if (!empty($this->country)) {
 			if ($this->country === true) {
-				if (!empty($this->language)) $defaultParams['gl'] = $this->language;				
+				if (!empty($this->language)) $defaultParams['gl'] = $this->language;
 			} else {
 				$defaultParams['gl'] = $this->country;
 			}
@@ -66,7 +66,7 @@ public function run()
 		for($p = 0; $p < 7; $p++) {
 			$start = $p * $perPage;
 			// build request url
-			$url = $baseURL.http_build_query($defaultParams).'&start='.$start;
+			$url = $baseURL.http_build_query($defaultParams, '', '&').'&start='.$start;
 			$response = Scraper::scrape($url);
 			if (!is_string($response)) {
 				continue;