Merge branch 'AD7six-allow-user-config-file' into 2.6-wip

CHANGELOG

@@ -14,11 +14,15 @@ version 2.5.3
 ------------------------
 * When parsing all individual HTML files, show how many that has been parsed every 20 run #354
 * Bug fix: The internal link to assets on the detailed page don't work  #355
-* Bug fix: When crawling, always use the first URL, not the redirected one (if redirected) #356
+* Bug fix: Redirected URL don't report the end location URL (see the description in the issue for the full story #356)
+
+version 2.5.2
+------------------------
+* Even better fix for #352
 
 version 2.5.1
 ------------------------
-* Fixed defect when trying to output error to the current console (instead of using the stderr) #354
+* Fixed defect when trying to output error to the current console (instead of using the stderr) #352
 
 version 2.5
 ------------------------

README.md

@@ -27,10 +27,6 @@ Here's a list of the main features, for a full list checkout the [documentation]
  * Get screenshots of your site at a specific viewport
  * See the most used assets for all analyzed pages
 
-Development
-=============
-The master branch is the latest release and/or in production-ready state. Clone that and you know it will always work. I'm using the [git-flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model, please send pull request to the develop branch.
-
 Documentation
 =============
 See <a href="http://www.sitespeed.io">http://www.sitespeed.io</a> for documentation. 

bin/sitespeed.io

@@ -120,6 +120,12 @@ BROWSERTIME_JAR=browsertime-0.5-full.jar
 # Don't fetch Navigation Timing metrics by default
 COLLECT_BROWSER_TIMINGS=false
 
+# Load user-specific config file if it exists
+if [ -f ~/.sitespeedio ]
+then
+    source ~/.sitespeedio
+fi
+
 # Store the input to be able to log exactly how/what was done
 INPUT="$@"