branch-names: now that trunk-tracking is master, update references (#1330)

Author: jeffkaufman

README.md

@@ -1,6 +1,6 @@
 ![ngx_pagespeed](https://lh6.googleusercontent.com/-qufedJIJq7Y/UXEvVYxyYvI/AAAAAAAADo8/JHDFQhs91_c/s401/04_ngx_pagespeed.png)
 
-[![Build Status](https://travis-ci.org/pagespeed/ngx_pagespeed.svg?branch=trunk-tracking)](https://travis-ci.org/pagespeed/ngx_pagespeed)
+[![Build Status](https://travis-ci.org/pagespeed/ngx_pagespeed.svg?branch=master)](https://travis-ci.org/pagespeed/ngx_pagespeed)
 
 ngx_pagespeed speeds up your site and reduces page load time by automatically
 applying web performance best practices to pages and associated assets (CSS,

scripts/build_ngx_pagespeed.sh

@@ -24,7 +24,7 @@ Options:
       * a version number, such as 1.11.33.4
 
       If you don't specify a version, defaults to latest-stable unless --devel
-      is specified, in which case it defaults to trunk-tracking.
+      is specified, in which case it defaults to master.
 
       This option doesn't make sense if we're running within an existing
       ngx_pagespeed checkout.
@@ -375,7 +375,7 @@ function build_ngx_pagespeed() {
     fi
   elif [ "$NPS_VERSION" = "DEFAULT" ]; then
     if "$DEVEL"; then
-      NPS_VERSION="trunk-tracking"
+      NPS_VERSION="master"
     else
       NPS_VERSION="latest-stable"
     fi