Fixing weird merge output.
Merge branch 'master' of github.com:GoogleCloudPlatform/gcloud-nodejs